From f5f43c6639957f95177bb77d2b569e16d4dab9dc Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 9 Jan 2023 16:34:04 +0100
Subject: Revert "strongSwan: upgrade scripts to work with package version
 5.9.8"

This reverts commit 6857447bf6acba3537d5e5372cd320aef078b81e.
---
 op-mode-definitions/monitor-log.xml.in | 2 +-
 op-mode-definitions/show-log.xml.in    | 4 ++--
 src/conf_mode/vpn_ipsec.py             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index c14f45d75..8abc5f4db 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -262,7 +262,7 @@
                 <properties>
                   <help>Monitor last lines of IPsec</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --follow --unit strongswan.service</command>
+                <command>journalctl --no-hostname --boot --follow --unit strongswan-starter.service</command>
               </leafNode>
               <leafNode name="l2tp">
                 <properties>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 70afaaf6e..977ece453 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -403,13 +403,13 @@
                 <properties>
                   <help>Show log for ALL</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service</command>
+                <command>journalctl --no-hostname --boot --unit strongswan-starter.service --unit accel-ppp@*.service</command>
               </leafNode>
               <leafNode name="ipsec">
                 <properties>
                   <help>Show log for IPsec</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service</command>
+                <command>journalctl --no-hostname --boot --unit strongswan-starter.service</command>
               </leafNode>
               <leafNode name="l2tp">
                 <properties>
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py
index 04e2f2939..b79e9847a 100755
--- a/src/conf_mode/vpn_ipsec.py
+++ b/src/conf_mode/vpn_ipsec.py
@@ -622,7 +622,7 @@ def wait_for_vici_socket(timeout=5, sleep_interval=0.1):
         sleep(sleep_interval)
 
 def apply(ipsec):
-    systemd_service = 'strongswan.service'
+    systemd_service = 'strongswan-starter.service'
     if not ipsec:
         call(f'systemctl stop {systemd_service}')
     else:
-- 
cgit v1.2.3