summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/soledad-server.init73
-rw-r--r--soledad_server/pkg/soledad72
2 files changed, 72 insertions, 73 deletions
diff --git a/debian/soledad-server.init b/debian/soledad-server.init
index e352c10c..b1d898cc 100644
--- a/debian/soledad-server.init
+++ b/debian/soledad-server.init
@@ -1 +1,72 @@
-../soledad_server/pkg/soledad
+#!/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
+RUNDIR=/var/lib/soledad/
+OBJ=leap.soledad_server.application
+LOGFILE=/var/log/soledad.log
+HTTPS_PORT=2424
+PLAIN_PORT=65534
+CERT_PATH=/etc/leap/soledad-server.pem
+PRIVKEY_PATH=/etc/leap/soledad-server.pem
+TWISTD_PATH=/usr/bin/twistd
+HOME=/var/lib/soledad/
+
+[ -r /etc/default/soledad ] && . /etc/default/soledad
+
+test -r /etc/leap/ || exit 0
+
+. /lib/lsb/init-functions
+
+
+case "$1" in
+ start)
+ echo -n "Starting soledad: twistd"
+ start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
+ --pidfile=$PIDFILE \
+ --logfile=$LOGFILE \
+ web \
+ --wsgi=$OBJ \
+ --https=$HTTPS_PORT \
+ --certificate=$CERT_PATH \
+ --privkey=$PRIVKEY_PATH \
+ --port=$PLAIN_PORT
+ 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/soledad_server/pkg/soledad b/soledad_server/pkg/soledad
deleted file mode 100644
index b1d898cc..00000000
--- a/soledad_server/pkg/soledad
+++ /dev/null
@@ -1,72 +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
-RUNDIR=/var/lib/soledad/
-OBJ=leap.soledad_server.application
-LOGFILE=/var/log/soledad.log
-HTTPS_PORT=2424
-PLAIN_PORT=65534
-CERT_PATH=/etc/leap/soledad-server.pem
-PRIVKEY_PATH=/etc/leap/soledad-server.pem
-TWISTD_PATH=/usr/bin/twistd
-HOME=/var/lib/soledad/
-
-[ -r /etc/default/soledad ] && . /etc/default/soledad
-
-test -r /etc/leap/ || exit 0
-
-. /lib/lsb/init-functions
-
-
-case "$1" in
- start)
- echo -n "Starting soledad: twistd"
- start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
- --pidfile=$PIDFILE \
- --logfile=$LOGFILE \
- web \
- --wsgi=$OBJ \
- --https=$HTTPS_PORT \
- --certificate=$CERT_PATH \
- --privkey=$PRIVKEY_PATH \
- --port=$PLAIN_PORT
- 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