aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2019-09-23 01:38:58 +0300
committerThomas Backlund <tmb@mageia.org>2019-09-23 01:38:58 +0300
commitbad28a9d097f2275b28dc7a7d92f06ed044fb0f6 (patch)
treeab6aa19150638587582f9d5089b8734613208d1e /src
parent2447a74120737fe87a4a9ca3dcd536af7e346d25 (diff)
downloadmsec-bad28a9d097f2275b28dc7a7d92f06ed044fb0f6.tar
msec-bad28a9d097f2275b28dc7a7d92f06ed044fb0f6.tar.gz
msec-bad28a9d097f2275b28dc7a7d92f06ed044fb0f6.tar.bz2
msec-bad28a9d097f2275b28dc7a7d92f06ed044fb0f6.tar.xz
msec-bad28a9d097f2275b28dc7a7d92f06ed044fb0f6.zip
use /etc/sysctl.d/51-drakx.conf instead of /etc/sysctl.conf
Diffstat (limited to 'src')
-rwxr-xr-xsrc/msec/plugins/msec.py4
-rwxr-xr-xsrc/msec/plugins/network.py4
2 files changed, 4 insertions, 4 deletions
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')