From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 30 Apr 2016 16:08:31 +0000 (+0200)
Subject: Remove tinc.service, it is not necessary.
X-Git-Tag: release-1.1pre13~2
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=0b6f84f96eeed20a0d771fedb72c0e19941adb7e;p=tinc

Remove tinc.service, it is not necessary.

Thanks to Alexander Ried for pointing out that if you have
tinc@.service template, systemd will provide a default slice containing
all instances of that template. So "systemctl start tinc" will still do
what we want it to do.
---

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index a1bfe124..043ec746 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -1,4 +1,4 @@
 if WITH_SYSTEMD
 systemddir = @systemd_path@
-dist_systemd_DATA = tinc.service tinc@.service
+dist_systemd_DATA = tinc@.service
 endif
diff --git a/systemd/tinc.service b/systemd/tinc.service
deleted file mode 100644
index d911fa78..00000000
--- a/systemd/tinc.service
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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