diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-04-24 16:54:51 +0200 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-04-24 16:54:51 +0200 |
| commit | 6ed34650a77fa09036207f62e5fcdfca291fbada (patch) | |
| tree | a0ba5046d81b2be31bec5b30cb52d43507e724e6 /etc | |
| parent | 2334aff978526dae574d5cc40ba7b6afa1846fd1 (diff) | |
| download | pfsense-6ed34650a77fa09036207f62e5fcdfca291fbada.zip pfsense-6ed34650a77fa09036207f62e5fcdfca291fbada.tar.gz | |
Is better to send the signal to starter rather than to charon directly. Starter manager charon properly. This should fix a lot of issues with configuration reloading that before sometimes did not work especially when changing phase2 entries
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vpn.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 93e1976..3e60e1a 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1123,11 +1123,10 @@ EOD; if ($restart === true) { mwexec("/usr/local/sbin/ipsec restart", false); } else { - if (isvalidpid("{$g['varrun_path']}/charon.pid")) { - /* Read secrets */ - mwexec("/usr/local/sbin/ipsec rereadall", false); + if (isvalidpid("{$g['varrun_path']}/starter.charon.pid")) { /* Update configuration changes */ - mwexec("/usr/local/sbin/ipsec update", false); + /* Read secrets */ + sigkillbypid("{$g['varrun_path']}/starter.charon.pid", 'USR1'); } else { mwexec("/usr/local/sbin/ipsec start", false); } |
