summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-07 21:21:18 +0100
committerGitHub <noreply@github.com>2024-02-07 21:21:18 +0100
commitf4528a4734b9628c93a31d679cf3b21bbd58b4c7 (patch)
tree88221ac8df77cab05a8b99f39239da400ab1f8bc /src/conf_mode
parent19f7d8a093dac0c150aff756d7d16588f5bbb76d (diff)
parente697ed1e7fd5c33f8082b2f4f96c42fc822ec9a5 (diff)
downloadvyos-1x-f4528a4734b9628c93a31d679cf3b21bbd58b4c7.tar.gz
vyos-1x-f4528a4734b9628c93a31d679cf3b21bbd58b4c7.zip
Merge pull request #2944 from HollyGurza/T3843-current
vpn: T3843: l2tp configuration not cleared after delete
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/vpn_l2tp.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 36b3d2a30..4ca717814 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -19,6 +19,7 @@ import os
from sys import exit
from vyos.config import Config
+from vyos.configdep import call_dependents, set_dependents
from vyos.configdict import get_accel_dict
from vyos.template import render
from vyos.utils.process import call
@@ -42,6 +43,9 @@ def get_config(config=None):
else:
conf = Config()
base = ['vpn', 'l2tp', 'remote-access']
+
+ set_dependents('ipsec', conf)
+
if not conf.exists(base):
return None
@@ -94,10 +98,10 @@ def apply(l2tp):
for file in [l2tp_chap_secrets, l2tp_conf]:
if os.path.exists(file):
os.unlink(file)
+ else:
+ call('systemctl restart accel-ppp@l2tp.service')
- return None
-
- call('systemctl restart accel-ppp@l2tp.service')
+ call_dependents()
if __name__ == '__main__':