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).
This commit is contained in:
Tobias Brunner 2019-03-29 10:00:42 +01:00
parent 20550480e1
commit 1815c1de52
10 changed files with 35 additions and 34 deletions

View File

@ -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

View File

@ -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

1
init/systemd-starter/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
strongswan-starter.service

View File

@ -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 > $@

View File

@ -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

View File

@ -1 +0,0 @@
strongswan-swanctl.service

View File

@ -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 > $@

View File

@ -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

View File

@ -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 > $@

View File

@ -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