From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 1 May 2016 10:07:44 +0000 (+0200)
Subject: Revert "Remove tinc.service, it is not necessary."
X-Git-Tag: release-1.1pre14~1
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=3f6c663a06aac728912c4e47cbc2dc4343a3798c

Revert "Remove tinc.service, it is not necessary."

This reverts commit 0b6f84f96eeed20a0d771fedb72c0e19941adb7e. Although
systemd does automatically provide a "tinc.slice" when there is only a
tinc@.service template, it doesn't quite work the same way as
tinc.service.
---

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 043ec746..a1bfe124 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -1,4 +1,4 @@
 if WITH_SYSTEMD
 systemddir = @systemd_path@
-dist_systemd_DATA = tinc@.service
+dist_systemd_DATA = tinc.service tinc@.service
 endif
diff --git a/systemd/tinc.service b/systemd/tinc.service
new file mode 100644
index 00000000..d911fa78
--- /dev/null
+++ b/systemd/tinc.service
@@ -0,0 +1,20 @@
+# This is a mostly empty service, but allows commands like stop, start, reload
+# to propagate to all tinc@ service instances.
+
+[Unit]
+Description=Tinc VPN
+Documentation=info:tinc
+Documentation=man:tinc(8) man:tinc.conf(5)
+Documentation=http://tinc-vpn.org/docs/
+After=network.target
+Wants=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecReload=/bin/true
+WorkingDirectory=/etc/tinc
+
+[Install]
+WantedBy=multi-user.target