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, 5 insertions, 0 deletions

diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index 013a07f32..cac911c8c 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -169,6 +169,10 @@ def get_config():
                     if key_eff != key_cfg and key_eff != None:
                         wg['peer_remove'].append(key_cfg)
 
+                # if a peer is disabled, we have to exec a remove for it's pubkey
+                else:
+                  peer_key = c.return_value('peer {peer} pubkey'.format(peer=p))
+                  wg['peer_remove'].append(peer_key)
     return wg
 
 
@@ -191,6 +195,7 @@ def verify(c):
             if not c['peer'][p]['pubkey']:
                 raise ConfigError("peer pubkey required for peer " + p)
 
+
 def apply(c):
     # no wg configs left, remove all interface from system
     # maybe move it into ifconfig.py