From bab0f4f698de7206c061123af073557f62836f94 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Tue, 5 Sep 2017 11:38:56 -0300
Subject: [pkg] remove deprecated init script

---
 pkg/server/soledad-server | 73 -----------------------------------------------
 setup.py                  | 13 +--------
 2 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 pkg/server/soledad-server

diff --git a/pkg/server/soledad-server b/pkg/server/soledad-server
deleted file mode 100644
index 450f2277..00000000
--- a/pkg/server/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
diff --git a/setup.py b/setup.py
index d7c1eeaf..4505de10 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,6 @@
 """
 Setup file for leap.soledad
 """
-import os
 import re
 import sys
 import versioneer
@@ -27,15 +26,6 @@ from setuptools import find_packages
 from setuptools.command.develop import develop as _cmd_develop
 
 
-isset = lambda var: os.environ.get(var, None)
-skip = ['VIRTUAL_ENV', 'LEAP_SKIP_INIT', 'READTHEDOCS']
-if len(filter(isset, skip)):
-    data_files = None
-else:
-    # XXX this should go only for linux/mac
-    data_files = [("/etc/init.d/", ["pkg/server/soledad-server"])]
-
-
 trove_classifiers = (
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -137,6 +127,5 @@ setup(
     package_dir={'': 'src'},
     package_data={'': ["*.sql"]},
     install_requires=install_requires,
-    extras_require=extras,
-    data_files=data_files
+    extras_require=extras
 )
-- 
cgit v1.2.3