From 608f385e693d03403fccf1934c1932129e9ae4e1 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 16 Dec 2014 14:47:21 -0200
Subject: Fix server initscript location (#6557).

---
 .../bug_6557_fix-server-initscript-location        |  1 +
 server/pkg/soledad                                 | 73 ----------------------
 server/pkg/soledad-server                          | 73 ++++++++++++++++++++++
 server/setup.py                                    |  2 +-
 4 files changed, 75 insertions(+), 74 deletions(-)
 create mode 100644 server/changes/bug_6557_fix-server-initscript-location
 delete mode 100644 server/pkg/soledad
 create mode 100644 server/pkg/soledad-server

diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
new file mode 100644
index 00000000..6032b302
--- /dev/null
+++ b/server/changes/bug_6557_fix-server-initscript-location
@@ -0,0 +1 @@
+  o Fix server initscript location (#6557).
diff --git a/server/pkg/soledad b/server/pkg/soledad
deleted file mode 100644
index ccb3e9b0..00000000
--- a/server/pkg/soledad
+++ /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
-RUNDIR=/var/lib/soledad/
-OBJ=leap.soledad.server.application
-LOGFILE=/var/log/soledad.log
-HTTPS_PORT=2424
-CERT_PATH=/etc/leap/soledad-server.pem
-PRIVKEY_PATH=/etc/leap/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 /etc/leap/ || exit 0
-
-. /lib/lsb/init-functions
-
-
-case "${1}" in
-    start)
-        echo -n "Starting soledad: twistd"
-          start-stop-daemon --start --quiet \
-            --user=${USER} --group=${GROUP} \
-            --exec ${TWISTD_PATH} -- \
-            --pidfile=${PIDFILE} \
-            --logfile=${LOGFILE} \
-            web \
-            --wsgi=${OBJ} \
-            --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 b/server/pkg/soledad-server
new file mode 100644
index 00000000..ccb3e9b0
--- /dev/null
+++ b/server/pkg/soledad-server
@@ -0,0 +1,73 @@
+#!/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
+CERT_PATH=/etc/leap/soledad-server.pem
+PRIVKEY_PATH=/etc/leap/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 /etc/leap/ || exit 0
+
+. /lib/lsb/init-functions
+
+
+case "${1}" in
+    start)
+        echo -n "Starting soledad: twistd"
+          start-stop-daemon --start --quiet \
+            --user=${USER} --group=${GROUP} \
+            --exec ${TWISTD_PATH} -- \
+            --pidfile=${PIDFILE} \
+            --logfile=${LOGFILE} \
+            web \
+            --wsgi=${OBJ} \
+            --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/setup.py b/server/setup.py
index 573622ce..124ddd32 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -35,7 +35,7 @@ if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'):
     data_files = None
 else:
     # XXX this should go only for linux/mac
-    data_files = [("/etc/init.d/", ["pkg/soledad"])]
+    data_files = [("/etc/init.d/", ["pkg/soledad-server"])]
 
 
 trove_classifiers = (
-- 
cgit v1.2.3