[pkg] switch to systemd-style init

2 files changed, 30 insertions, 73 deletions

diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
deleted file mode 100644
index 753a260b..00000000
--- a/server/pkg/soledad-server
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          soledad
-# Required-Start:    $network $named $remote_fs $syslog $time
-# Required-Stop:     $network $named $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start soledad daemon at boot time
-# Description:       Synchronization of locally encrypted data among devices
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-PIDFILE=/var/run/soledad.pid
-RESOURCE_CLASS=leap.soledad.server.resource.SoledadResource
-HTTPS_PORT=2424
-CONFDIR=/etc/soledad
-CERT_PATH="${CONFDIR}/soledad-server.pem"
-PRIVKEY_PATH="${CONFDIR}/soledad-server.key"
-TWISTD_PATH=/usr/bin/twistd
-HOME=/var/lib/soledad/
-SSL_METHOD=SSLv23_METHOD
-USER=soledad
-GROUP=soledad
-
-[ -r /etc/default/soledad ] && . /etc/default/soledad
-
-test -r ${CONFDIR} || exit 0
-
-. /lib/lsb/init-functions
-
-
-case "${1}" in
-    start)
-        echo -n "Starting soledad: twistd"
-          start-stop-daemon --start --quiet \
-            --exec ${TWISTD_PATH} -- \
-            --uid=${USER} --gid=${GROUP} \
-            --pidfile=${PIDFILE} \
-	    --syslog \
-	    --prefix=soledad-server \
-            web \
-            --class=${RESOURCE_CLASS} \
-            --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
-        echo "."
-    ;;
-
-    stop)
-        echo -n "Stopping soledad: twistd"
-        start-stop-daemon --stop --quiet  \
-            --pidfile ${PIDFILE}
-        echo "."
-    ;;
-
-    restart)
-        ${0} stop
-        ${0} start
-    ;;
-
-    force-reload)
-        ${0} restart
-    ;;
-
-    status)
-        status_of_proc -p ${PIDFILE} ${TWISTD_PATH} soledad && exit 0 || exit ${?}
-    ;;
-
-    *)
-        echo "Usage: /etc/init.d/soledad {start|stop|restart|force-reload|status}" >&2
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service
new file mode 100644
index 00000000..b7e3c0a9
--- /dev/null
+++ b/server/pkg/soledad-server.service
@@ -0,0 +1,30 @@
+[Unit]
+Description=Soledad Server
+
+[Service]
+Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin
+Environment=CLASS=leap.soledad.server.resource.SoledadResource
+Environment=HTTPS_PORT=2424
+Environment=CERT_PATH=/etc/soledad/soledad-server.pem
+Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key
+Environment=HOME=/var/lib/soledad/
+Environment=SSL_METHOD=SSLv23_METHOD
+EnvironmentFile=-/etc/default/soledad
+
+ExecStart=/usr/bin/twistd \
+  --nodaemon \
+  --syslog \
+  --prefix=soledad-server \
+  web \
+  --class=${CLASS} \
+  --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
+
+WorkingDirectory=/var/lib/soledad/
+
+User=soledad
+Group=soledad
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target