nopsyncd systemd unit is now a template

4 files changed, 19 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index cd2f059..e4a4696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-rhnop (0.12-1) UNRELEASED; urgency=medium
+rhnop (0.13-1) UNRELEASED; urgency=medium
+
+  * renamed daemons:
+	nopsyncd -> nopfetchd
+	nopcollectd -> nopsyncd
+  * make nopsyncd system unit a template
+
+ -- Christian Pointner <equinox@spreadspace.org>  Fri, 15 May 2015 02:24:06 +0200
+
+rhnop (0.12-1) unstable; urgency=medium
 
   * add systemd unit files
   * fix some issues with library and config path
diff --git a/debian/rhnop-client.nopsyncd-standby.service b/debian/rhnop-client.nopsyncd-standby.service
deleted file mode 100644
index 64518c2..0000000
--- a/debian/rhnop-client.nopsyncd-standby.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Radio Helsinki Now Playing Daemon (Client: Standby)
-
-[Service]
-ExecStart=/usr/bin/nopsyncd standby
-Restart=on-failure
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectSystem=full
-ProtectHome=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/rhnop-client.nopsyncd-master.service b/debian/rhnop-client.nopsyncd@.service
index 051d817..2f2b65a 100644
--- a/debian/rhnop-client.nopsyncd-master.service
+++ b/debian/rhnop-client.nopsyncd@.service
@@ -1,8 +1,8 @@
 [Unit]
-Description=Radio Helsinki Now Playing Daemon (Client: Master)
+Description=Radio Helsinki Now Playing Daemon (Client: %i)
 
 [Service]
-ExecStart=/usr/bin/nopsyncd master
+ExecStart=/usr/bin/nopsyncd %i
 Restart=on-failure
 PrivateTmp=yes
 PrivateDevices=yes
diff --git a/debian/rules b/debian/rules
index 35cc3c8..3de13ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,10 @@ override_dh_auto_configure:
 	dh_auto_configure -- --ebuild-compat
 
 override_dh_systemd_enable:
-	dh_systemd_enable --name=nopfetchd nopfetchd.service
-	dh_systemd_enable --name=nopsysstated nopsysstated.service
-	dh_systemd_enable --name=nopsyncd-master nopsyncd-master.service
-	dh_systemd_enable --name=nopsyncd-standby nopsyncd-standby.service
+	dh_systemd_enable -prhnop-server --no-enable --name=nopfetchd nopfetchd.service
+	dh_systemd_enable -prhnop-client --no-enable --name=nopsysstated nopsysstated.service
+	dh_systemd_enable -prhnop-client --no-enable --name=nopsyncd@ nopsyncd@.service
+
+override_dh_systemd_start:
+	dh_systemd_start -prhnop-server --no-start nopfetchd.service
+	dh_systemd_start -prhnop-client --no-start nopsysstated.service