Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  openvpn: bridge: T1556: remove obsolete bridge-group definition
  ifconfig: T1849: fix DHCPv6 startup
  Python/VyOS validate: T1849: handle is_ipv6()/is_ipv6() exceptions
  ifconfig: T1793: remove dhcpv6 client debug output
  ddclient: T1853: bugfix TypeError exception
  syslog: T1845: syslog host no longer accepts a port
  syslog: code formatting
  syslog: T1845: syslog host no longer accepts a port
  syslog: renaming files and conf script to fit new scheme
  T1855, T1826: clean up the reboot/shutdown script.
  wireguard: T1853: disable peer doesn't work
  Revert "syslog: T1845: syslog host no longer accepts a port"
  dmvpn: T1784: Add swanctl load call
  syslog: T1845: syslog host no longer accepts a port
  [vyos.config] T1847: correctly set_level for path given as empty string

1 files changed, 17 insertions, 4 deletions

diff --git a/src/conf_mode/ipsec-settings.py b/src/conf_mode/ipsec-settings.py
index 156bb2edd..331a62316 100755
--- a/src/conf_mode/ipsec-settings.py
+++ b/src/conf_mode/ipsec-settings.py
@@ -21,6 +21,7 @@ import re
 import os
 import jinja2
 import syslog as sl
+import time
 
 import vyos.config
 import vyos.defaults
@@ -38,6 +39,7 @@ server_cert_path = '/etc/ipsec.d/certs'
 server_key_path = '/etc/ipsec.d/private'
 delim_ipsec_l2tp_begin = "### VyOS L2TP VPN Begin ###"
 delim_ipsec_l2tp_end = "### VyOS L2TP VPN End ###"
+charon_pidfile = '/var/run/charon.pid'
 
 l2pt_ipsec_conf = '''
 {{delim_ipsec_l2tp_begin}}
@@ -243,11 +245,22 @@ def generate(data):
         remove_confs(delim_ipsec_l2tp_begin, delim_ipsec_l2tp_end, ipsec_secrets_flie)
         remove_confs(delim_ipsec_l2tp_begin, delim_ipsec_l2tp_end, ipsec_conf_flie)
 
-def apply(data):
-    # Do nothing
-    # StrongSWAN should only be restarted when actual tunnels are configured
-    # Restart ipsec for l2tp
+def restart_ipsec():
     os.system("ipsec restart >&/dev/null")
+    # counter for apply swanctl config
+    counter = 10
+    while counter <= 10:
+        if os.path.exists(charon_pidfile):
+            os.system("swanctl -q >&/dev/null")
+            break
+        counter -=1
+        time.sleep(1)
+        if counter == 0:
+            raise ConfigError('VPN configuration error: IPSec is not running.')
+
+def apply(data):
+    # Restart IPSec daemon
+    restart_ipsec()
 
 if __name__ == '__main__':
     try: