summaryrefslogtreecommitdiff
path: root/server/pkg/soledad-server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-06-18 11:18:10 -0300
committerKali Kaneko <kali@leap.se>2017-06-24 00:49:17 +0200
commit3e94cafa43d464d73815e21810b97a4faf54136d (patch)
tree04f5152e3dfc9f27b7dca2368c0eb8b3f094f5b5 /server/pkg/soledad-server
parent7d8ee786b086e47264619df3efa73e74440fd068 (diff)
[pkg] unify client and server into a single python package
We have been discussing about this merge for a while. Its main goal is to simplify things: code navigation, but also packaging. The rationale is that the code is more cohesive in this way, and there's only one source package to install. Dependencies that are only for the server or the client will not be installed by default, and they are expected to be provided by the environment. There are setuptools extras defined for the client and the server. Debianization is still expected to split the single source package into 3 binaries. Another avantage is that the documentation can now install a single package with a single step, and therefore include the docstrings into the generated docs. - Resolves: #8896
Diffstat (limited to 'server/pkg/soledad-server')
-rw-r--r--server/pkg/soledad-server73
1 files changed, 0 insertions, 73 deletions
diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
deleted file mode 100644
index 450f2277..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.entrypoint.SoledadEntrypoint
-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