From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
server/plugins-available/firewall_plugin.inc.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php
index 498c9c6..186e9b9 100644
--- a/server/plugins-available/firewall_plugin.inc.php
+++ b/server/plugins-available/firewall_plugin.inc.php
@@ -257,10 +257,12 @@
}
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('/sbin/insserv')) exec('insserv -d bastille-firewall');
$app->log('Restarting the firewall', LOGLEVEL_DEBUG);
} else {
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('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
$app->log('Stopping the firewall', LOGLEVEL_DEBUG);
}
@@ -272,6 +274,7 @@
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('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
$app->log('Stopping the firewall', LOGLEVEL_DEBUG);
}
--
Gitblit v1.9.1