Commit 006b572c authored by Till Brehm's avatar Till Brehm
Browse files

Fixed: FS#3127 - Firewall not fully disabled when the rule set is removed in ispconfig

parent 4887d4e9
...@@ -257,10 +257,12 @@ class firewall_plugin { ...@@ -257,10 +257,12 @@ class firewall_plugin {
} }
exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null'); exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults'); if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults');
if(@is_file('/sbin/insserv')) exec('insserv -d bastille-firewall');
$app->log('Restarting the firewall', LOGLEVEL_DEBUG); $app->log('Restarting the firewall', LOGLEVEL_DEBUG);
} else { } else {
exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null'); exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove'); if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
$app->log('Stopping the firewall', LOGLEVEL_DEBUG); $app->log('Stopping the firewall', LOGLEVEL_DEBUG);
} }
...@@ -272,6 +274,7 @@ class firewall_plugin { ...@@ -272,6 +274,7 @@ class firewall_plugin {
exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null'); exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove'); if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
$app->log('Stopping the firewall', LOGLEVEL_DEBUG); $app->log('Stopping the firewall', LOGLEVEL_DEBUG);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment