From 9963cbcb983a86962a5d0d52db4a4c52a0c9d682 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: May 21 2014 21:59:52 +0000
Subject: * Wed May 21 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1.0.24-3

- Update systemd

---

diff --git a/tinc.spec b/tinc.spec
index f889b92..aa8cdb3 100644
--- a/tinc.spec
+++ b/tinc.spec
@@ -1,12 +1,12 @@
 Name:           tinc
 Version:        1.0.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A virtual private network daemon
 
 License:        GPLv2+
 URL:            http://www.tinc-vpn.org/
 Source0:        http://www.tinc-vpn.org/packages/%{name}-%{version}.tar.gz
-Source1:        tincd.service
+Source1:        %{name}d@.service
 
 BuildRequires:  openssl-devel
 BuildRequires:  lzo-devel
@@ -37,30 +37,33 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}d.service
+install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}d@.service
 rm -f %{buildroot}%{_infodir}/dir
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-%systemd_post %{name}d.service
+%systemd_post %{name}d@.service
 
 %preun
 if [ $1 = 0 ] ; then
 /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
-%systemd_preun %{name}d.service
+%systemd_preun %{name}d@.service
 
 %postun
-%systemd_postun_with_restart %{name}d.service
+%systemd_postun_with_restart %{name}d@.service
 
 %files
 %doc AUTHORS COPYING COPYING.README NEWS README THANKS doc/sample* doc/*.tex
 %{_mandir}/man*/%{name}*.*
 %{_infodir}/%{name}.info.gz
 %{_sbindir}/%{name}d
-%{_unitdir}/%{name}d.service
+%{_unitdir}/%{name}d@.service
 
 %changelog
+* Wed May 21 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1.0.24-3
+- Update systemd
+
 * Wed May 21 2014 Fabian Affolter <mail@fabian-affolter.ch> - 1.0.24-2
 - Migration to systemd (rhbz#1078237)
 
diff --git a/tincd.service b/tincd.service
deleted file mode 100644
index f97d804..0000000
--- a/tincd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Tinc VPN daemon for network %i
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-failure
-ExecStart=/usr/sbin/tincd -n %i
-ExecStart=/usr/sbin/tincd -n %i -k
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tincd@.service b/tincd@.service
new file mode 100644
index 0000000..f97d804
--- /dev/null
+++ b/tincd@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Tinc VPN daemon for network %i
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-failure
+ExecStart=/usr/sbin/tincd -n %i
+ExecStart=/usr/sbin/tincd -n %i -k
+
+[Install]
+WantedBy=multi-user.target