diff options
| author | Christian Pointner <equinox@anytun.org> | 2016-07-08 02:42:49 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2016-07-08 02:42:49 +0200 |
| commit | a41392cd588a9bd863267638c60d944e157acf02 (patch) | |
| tree | 97e6b2bd241bd42b988e68a946a03cc6865387d1 | |
| parent | use exec @ launcher, also install control daemon systemd unit (diff) | |
anytun-control vs anytun-controld
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | usr/lib/systemd/system/anytun-controld@.service (renamed from usr/lib/systemd/system/anytun-control@.service) | 2 | ||||
| -rw-r--r-- | usr/lib/systemd/system/anytun@.service | 1 |
4 files changed, 5 insertions, 11 deletions
@@ -192,11 +192,6 @@ For each such CLIENT instance, use the following command to enable it: # systemctl enable anytun@${vpnname}.service -For each anytun SERVER instance, anytun-control must be enabled as well: - -# systemctl enable anytun@${vpnname}.service -# systemctl enable anytun-control@${vpnname}.service - Manually start and stop instances by replacing enable with start or stop. diff --git a/src/Makefile b/src/Makefile index d54ff0e..ebd4f71 100644 --- a/src/Makefile +++ b/src/Makefile @@ -312,11 +312,11 @@ install-systemd: $(INSTALL) -d $(DESTDIR)$(SYSTEMDDIR) $(INSTALL) -m 644 ../usr/lib/systemd/system/anytun.service $(DESTDIR)$(SYSTEMDDIR)/anytun.service @ sed -e 's#/usr/local/lib/#$(LIBDIR)/#' ../usr/lib/systemd/system/anytun@.service > ../usr/lib/systemd/system/anytun@.service.bak - @ sed -e 's#/usr/local/lib/#$(LIBDIR)/#' ../usr/lib/systemd/system/anytun-control@.service > ../usr/lib/systemd/system/anytun-control@.service.bak + @ sed -e 's#/usr/local/lib/#$(LIBDIR)/#' ../usr/lib/systemd/system/anytun-controld@.service > ../usr/lib/systemd/system/anytun-controld@.service.bak $(INSTALL) -m 644 ../usr/lib/systemd/system/anytun@.service.bak $(DESTDIR)$(SYSTEMDDIR)/anytun@.service - $(INSTALL) -m 644 ../usr/lib/systemd/system/anytun-control@.service.bak $(DESTDIR)$(SYSTEMDDIR)/anytun-control@.service + $(INSTALL) -m 644 ../usr/lib/systemd/system/anytun-controld@.service.bak $(DESTDIR)$(SYSTEMDDIR)/anytun-controld@.service rm -f ../usr/lib/systemd/system/anytun@.service.bak - rm -f ../usr/lib/systemd/system/anytun-control@.service.bak + rm -f ../usr/lib/systemd/system/anytun-controld@.service.bak $(INSTALL) -d $(DESTDIR)$(TMPFILESDDIR) $(INSTALL) -m 644 ../usr/lib/tmpfiles.d/anytun.conf $(DESTDIR)$(TMPFILESDDIR)/anytun.conf @@ -372,7 +372,7 @@ remove-etc: remove-systemd: rm -f $(DESTDIR)$(SYSTEMDDIR)/anytun.service rm -f $(DESTDIR)$(SYSTEMDDIR)/anytun@.service - rm -f $(DESTDIR)$(SYSTEMDDIR)/anytun-control@.service + rm -f $(DESTDIR)$(SYSTEMDDIR)/anytun-controld@.service rm -f $(DESTDIR)$(TMPFILESDDIR)/anytun.conf remove-examples: diff --git a/usr/lib/systemd/system/anytun-control@.service b/usr/lib/systemd/system/anytun-controld@.service index 2fd0b75..675dbcf 100644 --- a/usr/lib/systemd/system/anytun-control@.service +++ b/usr/lib/systemd/system/anytun-controld@.service @@ -1,7 +1,6 @@ [Unit] Description=secure anycast tunneling config daemon for %i PartOf=anytun.service -ReloadPropagatedFrom=anytun.service Requires=anytun@%i.service After=anytun@%i.service Documentation=man:anytun-controld(8) @@ -19,3 +18,4 @@ ProtectHome=yes [Install] WantedBy=multi-user.target +Also=anytun@%i.service diff --git a/usr/lib/systemd/system/anytun@.service b/usr/lib/systemd/system/anytun@.service index a837889..17a5b0c 100644 --- a/usr/lib/systemd/system/anytun@.service +++ b/usr/lib/systemd/system/anytun@.service @@ -1,7 +1,6 @@ [Unit] Description=secure anycast tunneling daemon for %i PartOf=anytun.service -ReloadPropagatedFrom=anytun.service Wants=anytun-controld@%i.service Documentation=man:anytun(8) |