changes on downtimed.systemd (bug #756282)

3 files changed, 25 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 8bcdc9b..2f7fb23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+downtimed (0.6-4) unstable; urgency=medium
+
+  * Move downtimed.service from debian/systemd/ to debian/.
+  * debian/downtimed.service (Closes: #756282)
+    - Change Unit/Description to describe the service better.
+    - Remove not required Unit/After=network.target.
+    - Remove unnecessary Service/KillMode=process.
+    - Add new Service/Type=forking so that systemd can handle downtimed.
+    - Remove -D from Service/ExecStart to enable database updates. 
+      Thanks to Romain Francoise <rfrancoise@debian.org>
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 28 Jul 2014 20:14:25 +0200
+
 downtimed (0.6-3) unstable; urgency=medium
 
   * debian/systemd/downtimed.service:
diff --git a/debian/downtimed.service b/debian/downtimed.service
index 81f2345..2ce4506 120000..100644
--- a/debian/downtimed.service
+++ b/debian/downtimed.service
@@ -1 +1,12 @@
-systemd/downtimed.service
\ No newline at end of file
+[Unit]
+Description=Downtime record keeper
+
+[Service]
+EnvironmentFile=-/etc/default/downtimed
+ExecStart=/usr/sbin/downtimed $DOWNTIMED_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+Type=forking
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/systemd/downtimed.service b/debian/systemd/downtimed.service
deleted file mode 100644
index 4cb2be8..0000000
--- a/debian/systemd/downtimed.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dowmtimed server
-After=network.target 
-
-[Service]
-EnvironmentFile=-/etc/default/downtimed
-ExecStart=/usr/sbin/downtimed -D $DOWNTIMED_OPTS
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target