summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkhramshinr <khramshinr@gmail.com>2024-02-06 17:35:27 +0700
committerkhramshinr <khramshinr@gmail.com>2024-02-06 17:36:38 +0700
commite697ed1e7fd5c33f8082b2f4f96c42fc822ec9a5 (patch)
treed3942ebffdefcdbe656c577c4bd47c94ddeff85a /src
parentda465d26b524fb26e0e9085e80a3ccaa6435eaa9 (diff)
downloadvyos-1x-e697ed1e7fd5c33f8082b2f4f96c42fc822ec9a5.tar.gz
vyos-1x-e697ed1e7fd5c33f8082b2f4f96c42fc822ec9a5.zip
vpn: T3843: l2tp configuration not cleared after delete
vpn: T5926: IPSEC does not apply after l2tp configuration was changed added dependency between l2tp and ipsec conf added test for apply config to swanctl
Diffstat (limited to 'src')
-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__':