From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 29 Mar 2019 09:00:42 +0000 (+0100)
Subject: init: Rename systemd units
X-Git-Tag: 5.8.0rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1815c1de522aed4c700e221fb44024922ef17f14;p=thirdparty%2Fstrongswan.git

init: Rename systemd units

Use strongswan-starter for the legacy unit and simply strongswan for the
modern one (strongswan-swanctl is configured as alias, which should
cause the installation of symlinks when the service is enabled via
systemctl).
---

diff --git a/configure.ac b/configure.ac
index 9a1c5a30d2..78b3877347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1819,7 +1819,7 @@ AC_CONFIG_FILES([
 	man/Makefile
 	init/Makefile
 	init/systemd/Makefile
-	init/systemd-swanctl/Makefile
+	init/systemd-starter/Makefile
 	src/Makefile
 	src/include/Makefile
 	src/libstrongswan/Makefile
diff --git a/init/Makefile.am b/init/Makefile.am
index 6fff4221b8..54c090cea9 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS =
 
 if USE_LEGACY_SYSTEMD
 if USE_CHARON
-  SUBDIRS += systemd
+  SUBDIRS += systemd-starter
 endif
 endif
 
 if USE_SYSTEMD
 if USE_SWANCTL
-  SUBDIRS += systemd-swanctl
+  SUBDIRS += systemd
 endif
 endif
diff --git a/init/systemd-starter/.gitignore b/init/systemd-starter/.gitignore
new file mode 100644
index 0000000000..1eeaa29a5c
--- /dev/null
+++ b/init/systemd-starter/.gitignore
@@ -0,0 +1 @@
+strongswan-starter.service
diff --git a/init/systemd-starter/Makefile.am b/init/systemd-starter/Makefile.am
new file mode 100644
index 0000000000..f8b02a3f98
--- /dev/null
+++ b/init/systemd-starter/Makefile.am
@@ -0,0 +1,12 @@
+
+EXTRA_DIST = strongswan-starter.service.in
+CLEANFILES = strongswan-starter.service
+
+systemdsystemunit_DATA = strongswan-starter.service
+
+strongswan-starter.service : strongswan-starter.service.in
+	$(AM_V_GEN) \
+	sed \
+	-e "s:@SBINDIR@:$(sbindir):" \
+	-e "s:@IPSEC_SCRIPT@:$(ipsec_script):" \
+	$(srcdir)/$@.in > $@
diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in
new file mode 100644
index 0000000000..474284a198
--- /dev/null
+++ b/init/systemd-starter/strongswan-starter.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=strongSwan IPsec IKEv1/IKEv2 daemon using ipsec.conf
+After=syslog.target network-online.target
+
+[Service]
+ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
+StandardOutput=syslog
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/init/systemd-swanctl/.gitignore b/init/systemd-swanctl/.gitignore
deleted file mode 100644
index b973780a98..0000000000
--- a/init/systemd-swanctl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strongswan-swanctl.service
diff --git a/init/systemd-swanctl/Makefile.am b/init/systemd-swanctl/Makefile.am
deleted file mode 100644
index eee30acc82..0000000000
--- a/init/systemd-swanctl/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-EXTRA_DIST = strongswan-swanctl.service.in
-CLEANFILES = strongswan-swanctl.service
-
-systemdsystemunit_DATA = strongswan-swanctl.service
-
-strongswan-swanctl.service : strongswan-swanctl.service.in
-	$(AM_V_GEN) \
-	sed \
-	-e "s:@SBINDIR@:$(sbindir):" \
-	$(srcdir)/$@.in > $@
diff --git a/init/systemd-swanctl/strongswan-swanctl.service.in b/init/systemd-swanctl/strongswan-swanctl.service.in
deleted file mode 100644
index db8266a632..0000000000
--- a/init/systemd-swanctl/strongswan-swanctl.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=strongSwan IPsec IKEv1/IKEv2 daemon using swanctl
-After=network-online.target
-
-[Service]
-Type=notify
-ExecStart=@SBINDIR@/charon-systemd
-ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt
-ExecReload=@SBINDIR@/swanctl --reload
-ExecReload=@SBINDIR@/swanctl --load-all --noprompt
-Restart=on-abnormal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
index e4b7166d66..b49de3b91d 100644
--- a/init/systemd/Makefile.am
+++ b/init/systemd/Makefile.am
@@ -8,5 +8,4 @@ strongswan.service : strongswan.service.in
 	$(AM_V_GEN) \
 	sed \
 	-e "s:@SBINDIR@:$(sbindir):" \
-	-e "s:@IPSEC_SCRIPT@:$(ipsec_script):" \
 	$(srcdir)/$@.in > $@
diff --git a/init/systemd/strongswan.service.in b/init/systemd/strongswan.service.in
index 474284a198..87ad0c905d 100644
--- a/init/systemd/strongswan.service.in
+++ b/init/systemd/strongswan.service.in
@@ -1,11 +1,15 @@
 [Unit]
-Description=strongSwan IPsec IKEv1/IKEv2 daemon using ipsec.conf
-After=syslog.target network-online.target
+Description=strongSwan IPsec IKEv1/IKEv2 daemon using swanctl
+After=network-online.target
 
 [Service]
-ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
-StandardOutput=syslog
+Type=notify
+ExecStart=@SBINDIR@/charon-systemd
+ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt
+ExecReload=@SBINDIR@/swanctl --reload
+ExecReload=@SBINDIR@/swanctl --load-all --noprompt
 Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
+Alias=strongswan-swanctl.service