summaryrefslogtreecommitdiffstats
path: root/etc/inc/vpn.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-01-02 18:43:19 +0000
committerErmal <eri@pfsense.org>2013-01-02 18:43:19 +0000
commit5d6495a7a4ec58d2c17b97064f82ec672428a5b6 (patch)
tree9c22ad672e80d8302ed8fd79ff2ce8debca76623 /etc/inc/vpn.inc
parentb08e147f433b689870206a1b98f91d716bd13c9a (diff)
downloadpfsense-5d6495a7a4ec58d2c17b97064f82ec672428a5b6.zip
pfsense-5d6495a7a4ec58d2c17b97064f82ec672428a5b6.tar.gz
Tell filterdns to reload the config rather than restart if its running
Diffstat (limited to 'etc/inc/vpn.inc')
-rw-r--r--etc/inc/vpn.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 26d8bcb..f7cd290 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -977,9 +977,12 @@ EOD;
file_put_contents("{$g['varetc_path']}/ipsec/filterdns-ipsec.hosts", $hostnames);
unset($hostnames);
- killbypid("{$g['varrun_path']}/filterdns-ipsec.pid");
- sleep(1);
- mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-ipsec.pid -i {$interval} -c {$g['varetc_path']}/ipsec/filterdns-ipsec.hosts -d 1");
+ if (isvalidpid("{$g['varrun_path']}/filterdns-ipsec.pid"))
+ sigkillbypid("{$g['varrun_path']}/filterdns-ipsec.pid", "HUP");
+ else {
+ killbypid("{$g['varrun_path']}/filterdns-ipsec.pid");
+ mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-ipsec.pid -i {$interval} -c {$g['varetc_path']}/ipsec/filterdns-ipsec.hosts -d 1");
+ }
}
vpn_ipsec_failover_configure();
OpenPOWER on IntegriCloud