From a41392cd588a9bd863267638c60d944e157acf02 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Fri, 8 Jul 2016 02:42:49 +0200
Subject: anytun-control vs anytun-controld

---
 README                                          |  5 -----
 src/Makefile                                    |  8 ++++----
 usr/lib/systemd/system/anytun-control@.service  | 21 ---------------------
 usr/lib/systemd/system/anytun-controld@.service | 21 +++++++++++++++++++++
 usr/lib/systemd/system/anytun@.service          |  1 -
 5 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 usr/lib/systemd/system/anytun-control@.service
 create mode 100644 usr/lib/systemd/system/anytun-controld@.service

diff --git a/README b/README
index 6d64711..8eb9c3b 100644
--- a/README
+++ b/README
@@ -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-control@.service
deleted file mode 100644
index 2fd0b75..0000000
--- a/usr/lib/systemd/system/anytun-control@.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[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)
-
-[Service]
-Type=simple
-PIDFile=/run/anytun-controld/%i.pid
-Environment="NAME=%i" "DAEMONOPTS=-D -L stdout:3 --username anytun"
-ExecStart=/usr/local/lib/anytun-launcher configd
-Restart=on-failure
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectSystem=full
-ProtectHome=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/usr/lib/systemd/system/anytun-controld@.service b/usr/lib/systemd/system/anytun-controld@.service
new file mode 100644
index 0000000..675dbcf
--- /dev/null
+++ b/usr/lib/systemd/system/anytun-controld@.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=secure anycast tunneling config daemon for %i
+PartOf=anytun.service
+Requires=anytun@%i.service
+After=anytun@%i.service
+Documentation=man:anytun-controld(8)
+
+[Service]
+Type=simple
+PIDFile=/run/anytun-controld/%i.pid
+Environment="NAME=%i" "DAEMONOPTS=-D -L stdout:3 --username anytun"
+ExecStart=/usr/local/lib/anytun-launcher configd
+Restart=on-failure
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
+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)
 
-- 
cgit v1.2.3