From 304929ac3cdbe7a124f374e84283a8e0fdf9ff99 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Fri, 24 Oct 2025 21:06:06 +0200 Subject: vyos.defaults: T7953: globally define openconnect systemd service name --- src/conf_mode/vpn_openconnect.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/conf_mode/vpn_openconnect.py b/src/conf_mode/vpn_openconnect.py index 78cdaa179..68cd363f0 100755 --- a/src/conf_mode/vpn_openconnect.py +++ b/src/conf_mode/vpn_openconnect.py @@ -21,6 +21,7 @@ from vyos.base import Warning from vyos.config import Config from vyos.configverify import verify_pki_certificate from vyos.configverify import verify_pki_ca_certificate +from vyos.defaults import systemd_services from vyos.pki import find_chain from vyos.pki import encode_certificate from vyos.pki import load_certificate @@ -386,17 +387,18 @@ def generate(ocserv): def apply(ocserv): + service_name = systemd_services['openconnect'] if not ocserv: - call('systemctl stop ocserv.service') + call(f'systemctl stop {service_name}') for file in [ocserv_conf, ocserv_passwd, ocserv_otp_usr]: if os.path.exists(file): os.unlink(file) else: - call('systemctl reload-or-restart ocserv.service') + call(f'systemctl reload-or-restart {service_name}') counter = 0 while True: # exit early when service runs - if is_systemd_service_running('ocserv.service'): + if is_systemd_service_running(service_name): break sleep(0.250) if counter > 5: -- cgit v1.2.3