From 8974abcfc30d2e8c33384e9f8d30e77ea8ea318c Mon Sep 17 00:00:00 2001 From: Michael Ramsey Date: Fri, 29 Nov 2019 11:25:05 -0500 Subject: [PATCH] Revert "Update CSF to enable Ipset" This reverts commit c282a7155af192bcb55e424c7e9b784b1f8c8498. --- plogical/csf.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plogical/csf.py b/plogical/csf.py index 601a375ab..666b9136d 100755 --- a/plogical/csf.py +++ b/plogical/csf.py @@ -73,10 +73,10 @@ class CSF(multi.Thread): # install required packages for CSF perl and /usr/bin/host if ProcessUtilities.decideDistro() == ProcessUtilities.centos: - command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph ipset -y' + command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph -y' ProcessUtilities.normalExecutioner(command) elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: - command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools ipset -y' + command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools -y' ProcessUtilities.normalExecutioner(command) command = 'ln -s /bin/systemctl /usr/bin/systemctl' ProcessUtilities.normalExecutioner(command) @@ -280,10 +280,6 @@ class CSF(multi.Thread): elif items.find('PT_LOAD =') > -1 and items.find('=') > -1 and (items[0] != '#'): writeToConf.writelines('PT_LOAD = "0"\n') - # Enable LF_IPSET for CSF for more efficient ipables rules with ipset - elif items.find('LF_IPSET =') > -1 and items.find('=') > -1 and (items[0] != '#'): - writeToConf.writelines('LF_IPSET = "1"\n') - # HTACCESS_LOG is ins main error.log elif items.find('HTACCESS_LOG =') > -1 and items.find('=') > -1 and (items[0] != '#'): writeToConf.writelines('HTACCESS_LOG = "/usr/local/lsws/logs/error.log"\n')