aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rwxr-xr-xsrc/msec/plugins/msec.py4
-rwxr-xr-xsrc/msec/plugins/network.py4
3 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index e138b32..b982131 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- use /etc/sysctl.d/51-drakx.conf instead of /etc/sysctl.conf
+
Version 2.7 - May 20, 2019 Thomas Backlund
- translation updates
diff --git a/src/msec/plugins/msec.py b/src/msec/plugins/msec.py
index 8aba2a0..34adaa1 100755
--- a/src/msec/plugins/msec.py
+++ b/src/msec/plugins/msec.py
@@ -60,7 +60,7 @@ SHUTDOWN = '/usr/bin/shutdown'
SHUTDOWNALLOW = '/etc/shutdown.allow'
SSHDCONFIG = '/etc/ssh/sshd_config'
STARTX = '/usr/bin/startx'
-SYSCTLCONF = '/etc/sysctl.conf'
+SYSCTLCONF = '/etc/sysctl.d/51-drakx.conf'
JOURNALDCONF = '/etc/systemd/journald.conf'
XDM = '/etc/pam.d/xdm'
XSERVERS = '/etc/X11/xdm/Xservers'
@@ -100,7 +100,7 @@ class msec:
# associate helper commands with files
self.configfiles.add_config_assoc(INITTAB, '/sbin/telinit q')
self.configfiles.add_config_assoc('/etc(?:/rc.d)?/init.d/(.+)', '[ -f /var/lock/subsys/@1 ] && @0 reload')
- self.configfiles.add_config_assoc(SYSCTLCONF, '/sbin/sysctl -e -p /etc/sysctl.conf')
+ self.configfiles.add_config_assoc(SYSCTLCONF, '/sbin/sysctl -e -p /etc/sysctl.d/51-drakx.conf')
self.configfiles.add_config_assoc(SSHDCONFIG, '[ -f /var/lock/subsys/sshd ] && /etc/rc.d/init.d/sshd restart')
self.configfiles.add_config_assoc(LILOCONF, '[ `/usr/sbin/detectloader` = LILO ] && /sbin/lilo')
self.configfiles.add_config_assoc(JOURNALDCONF, '[ -f /var/lock/subsys/journald ] && systemctl restart journald')
diff --git a/src/msec/plugins/network.py b/src/msec/plugins/network.py
index e33a51b..37959f5 100755
--- a/src/msec/plugins/network.py
+++ b/src/msec/plugins/network.py
@@ -56,7 +56,7 @@ SHUTDOWN = '/usr/bin/shutdown'
SHUTDOWNALLOW = '/etc/shutdown.allow'
SSHDCONFIG = '/etc/ssh/sshd_config'
STARTX = '/usr/bin/startx'
-SYSCTLCONF = '/etc/sysctl.conf'
+SYSCTLCONF = '/etc/sysctl.d/51-drakx.conf'
SYSLOGCONF = '/etc/syslog.conf'
XDM = '/etc/pam.d/xdm'
XSERVERS = '/etc/X11/xdm/Xservers'
@@ -96,7 +96,7 @@ class network:
# associate helper commands with files
self.configfiles.add_config_assoc(INITTAB, '/sbin/telinit q')
self.configfiles.add_config_assoc('/etc(?:/rc.d)?/init.d/(.+)', '[ -f /var/lock/subsys/@1 ] && @0 reload')
- self.configfiles.add_config_assoc(SYSCTLCONF, '/sbin/sysctl -e -p /etc/sysctl.conf')
+ self.configfiles.add_config_assoc(SYSCTLCONF, '/sbin/sysctl -e -p /etc/sysctl.d/51-drakx.conf')
self.configfiles.add_config_assoc(SSHDCONFIG, '[ -f /var/lock/subsys/sshd ] && /etc/rc.d/init.d/sshd restart')
self.configfiles.add_config_assoc(LILOCONF, '[ `/usr/sbin/detectloader` = LILO ] && /sbin/lilo')
self.configfiles.add_config_assoc(SYSLOGCONF, '[ -f /var/lock/subsys/syslog ] && service syslog reload')