aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Smith <colin@pfsense.org>2005-03-06 23:19:00 +0000
committerColin Smith <colin@pfsense.org>2005-03-06 23:19:00 +0000
commit2f31fe2039fbf4788c97f9e6a49c889661cffdb6 (patch)
treeb5c007c173aeed3febdbdb8fe35411c43501a55e
parent5962b089769f7abd661094e2a921633e18427382 (diff)
downloadpfsense-packages-2f31fe2039fbf4788c97f9e6a49c889661cffdb6.tar.gz
pfsense-packages-2f31fe2039fbf4788c97f9e6a49c889661cffdb6.tar.bz2
pfsense-packages-2f31fe2039fbf4788c97f9e6a49c889661cffdb6.zip
* Replace killall -HUP with a killall followed by rc.d script execution.
-rw-r--r--packages/doorman.xml6
-rw-r--r--packages/doormanusers.xml3
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/doorman.xml b/packages/doorman.xml
index 4aef94b9..38a5b5f1 100644
--- a/packages/doorman.xml
+++ b/packages/doorman.xml
@@ -66,8 +66,9 @@
<custom_php_install_command>
global $config;
$fout = fopen("/usr/local/etc/rc.d/doormand.sh","w");
- fwrite($fout, $!/bin/sh\n\n/usr/local/sbin/doormand\n");
+ fwrite($fout, $!/bin/sh\n\n/usr/local/sbin/doormand -D &\n");
fclose($fout);
+ mwexec("chmod a+x /usr/local/etc/rc.d/doormand.sh");
</custom_php_install_command>
<custom_php_command_before_form>
function sync_package_doorman() {
@@ -89,7 +90,8 @@
if($_POST['checkdelay'] != "") fwrite($fout, "connection_delay_2 " . $_POST['checkdelay'] . "\n");
fwrite($fout, "pidfile /var/run/doormand.pid\nlogfile /var/log/messages\nloglevel NOTICE\nguestlist /usr/local/etc/doormand/guestlist\nfirewall-add /usr/local/etc/doormand/pfctl_add\nfirewall-del /usr/local/etc/doormand/pfctl_del\ntag-queue-length 100000\ntag-queue /var/doorman_tag_queue\ntag-db /var/doorman_tag_db.db\n");
fclose($fout);
- mwexec("killall -HUP doormand");
+ mwexec("killall doormand");
+ mwexec("/usr/local/etc/rc.d/doormand.sh");
conf_mount_ro();
config_unlock();
}
diff --git a/packages/doormanusers.xml b/packages/doormanusers.xml
index d548e009..0f0d4813 100644
--- a/packages/doormanusers.xml
+++ b/packages/doormanusers.xml
@@ -84,7 +84,8 @@
}
}
fclose($fout);
- mwexec("killall -HUP doormand");
+ mwexec("killall doormand");
+ mwexec("/usr/local/etc/rc.d/doormand.sh");
conf_mount_ro();
config_unlock();
}