summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-11-11 10:38:32 -0200
committerRenato Botelho <renato@netgate.com>2015-11-11 10:38:32 -0200
commitd92c10130df38e264c7c77367cf0d542d10794c0 (patch)
tree908e41ee60cad62f43605f9241b38e18b9b6b14b
parent35bc0aca0690c7875d3df440880d8527fc280894 (diff)
downloadpfsense-d92c10130df38e264c7c77367cf0d542d10794c0.zip
pfsense-d92c10130df38e264c7c77367cf0d542d10794c0.tar.gz
Use --conf when call ipsec start/stop, this make it work with regular package, without changing sysconfdir
-rw-r--r--src/etc/inc/vpn.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 1ca1f81..47d7108 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1372,7 +1372,7 @@ EOD;
/* manage process */
if ($restart === true) {
- mwexec("/usr/local/sbin/ipsec restart", false);
+ mwexec("/usr/local/sbin/ipsec restart --conf {$g['varetc_path']}/ipsec/ipsec.conf", false);
} else {
if (isvalidpid("{$g['varrun_path']}/starter.charon.pid")) {
/* Update configuration changes */
@@ -1380,7 +1380,7 @@ EOD;
mwexec("/usr/local/sbin/ipsec rereadall", false);
mwexec("/usr/local/sbin/ipsec reload", false);
} else {
- mwexec("/usr/local/sbin/ipsec start", false);
+ mwexec("/usr/local/sbin/ipsec start --conf {$g['varetc_path']}/ipsec/ipsec.conf", false);
}
}
OpenPOWER on IntegriCloud