summaryrefslogtreecommitdiff
path: root/server/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'server/pkg')
-rw-r--r--server/pkg/requirements.pip17
-rw-r--r--server/pkg/soledad-server (renamed from server/pkg/soledad)2
2 files changed, 6 insertions, 13 deletions
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index be5d156b..df6ad95d 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -4,19 +4,12 @@ simplejson
u1db
routes
PyOpenSSL<0.14
-
-# TODO: maybe we just want twisted-web?
-twisted>=12.0.0
+twisted
# leap deps -- bump me!
-leap.soledad.common>=0.3.0
-
-#
-# Things yet to fix:
-#
-
-# oauth is not strictly needed by us, but we need it
-# until u1db adds it to its release as a dep.
+leap.soledad.common>=0.6.5
+# XXX -- fix me!
+# oauth is not strictly needed by us, but we need it until u1db adds it to its
+# release as a dep.
oauth
-
diff --git a/server/pkg/soledad b/server/pkg/soledad-server
index ccb3e9b0..811ad55b 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad-server
@@ -34,8 +34,8 @@ case "${1}" in
start)
echo -n "Starting soledad: twistd"
start-stop-daemon --start --quiet \
- --user=${USER} --group=${GROUP} \
--exec ${TWISTD_PATH} -- \
+ --uid=${USER} --gid=${GROUP} \
--pidfile=${PIDFILE} \
--logfile=${LOGFILE} \
web \