Merge lp:~tohyland/endroid/systemd into lp:endroid

[Tomas Hyland]

New unit file for Endroid systemd initialisation

Upgrading from Ubuntu 14.04 (Trusty) to 16.04 (Xenial)means that Ubuntu's init system has moved from Upstart to Systemd. This change provides a systemd unit file to support this change. This file should be installed at /etc/systemd/system .

[Tomas Hyland (tohyland)]

(Ignore the previous merge request I made. This should be the correct diff)

[Matthew Hall (matt.hall)]

Create a new version (1.4.9) in debian/changelog (with the distribution field set to 'xenial' rather than 'trusty'.)

[lp:~tohyland/endroid/systemd]

106. By Tomas Hyland <email address hidden> on 2018-05-21

Mark-ups for systemd init changes

[Matthew Hall (matt.hall)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-14 16:17:18 +0000
+++ debian/changelog	2018-05-21 15:32:50 +0000
@@ -1,3 +1,9 @@
+endroid (1.4.9) xenial; urgency=medium
+
+  * Change start up mechanism from upstart to Systemd 
+
+ -- Tomas Hyland <[e-mail]>  Mon, 21 May 2018 16:29:15 +0100
+
 endroid (1.4.8) trusty; urgency=medium
 
   * Fix bug in DB update function
 
=== modified file 'debian/endroid.install'
--- debian/endroid.install	2016-01-14 15:16:05 +0000
+++ debian/endroid.install	2018-05-21 15:32:50 +0000
@@ -1,6 +1,6 @@
 etc/endroid.conf etc/endroid/
 etc/endroid.conf usr/share/doc/endroid/examples/
-etc/init/endroid.conf etc/init/
+etc/init/endroid.service etc/systemd/system/
 bin/endroid usr/bin/
 bin/endroid_remote usr/bin/
 bin/spelunk_hi5s usr/sbin/
 
=== removed file 'etc/init/endroid.conf'
--- etc/init/endroid.conf	2016-01-13 18:09:42 +0000
+++ etc/init/endroid.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-description "EnDroid XMPP bot"
-author "Ensoft Limited"
-
-exec /usr/bin/endroid --logtwisted -L /var/log/endroid.log --config /etc/endroid/endroid.conf
-start on net-device-up
-stop on stopping network
-stop on starting shutdown
-
-# Respawn if endroid exits
-respawn
-# Only respawn max 10 times in 5s period, otherwise fail
-respawn limit 10 5
 
=== added file 'etc/init/endroid.service'
--- etc/init/endroid.service	1970-01-01 00:00:00 +0000
+++ etc/init/endroid.service	2018-05-21 15:32:50 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=Endroid XMPP bot Author Ensoft Limited
+After=networking.service
+
+# Only respawn a max 10 times in a 5s period, otherwise fail.
+StartLimitInterval=5
+StartLimitBurst=10
+
+[Service]
+Environment=ENDROID_PYTHON=<set to python location>
+
+ExecStart=/usr/bin/endroid --logtwisted -L /var/log/endroid.log --config /etc/endroid/endroid.conf
+
+# Respawn if endroid exits
+Restart=on-failure