summaryrefslogtreecommitdiff
path: root/soledad_server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-04 16:22:27 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-04 16:22:27 -0300
commitf0f5feb96cec5b0a7212fdf9468a40f6e5013706 (patch)
tree3e446206ced5cfa712a67f5763133eab1c7ec2d1 /soledad_server
parentd09c78c0981f5637b8b7fbd32c4924764f566fd5 (diff)
parenta3da18d87c9c93c603f1f088d799734b18127746 (diff)
Merge remote-tracking branch 'drebs/bug/3095-initscript-uses-wrong-wsgi-name' into develop
Diffstat (limited to 'soledad_server')
-rw-r--r--soledad_server/pkg/soledad2
-rw-r--r--soledad_server/setup.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/soledad_server/pkg/soledad b/soledad_server/pkg/soledad
index c640a94d..b1d898cc 100644
--- a/soledad_server/pkg/soledad
+++ b/soledad_server/pkg/soledad
@@ -12,7 +12,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
PIDFILE=/var/run/soledad.pid
RUNDIR=/var/lib/soledad/
-OBJ=leap.soledad.server.application
+OBJ=leap.soledad_server.application
LOGFILE=/var/log/soledad.log
HTTPS_PORT=2424
PLAIN_PORT=65534
diff --git a/soledad_server/setup.py b/soledad_server/setup.py
index 5e5fa058..2ba56ece 100644
--- a/soledad_server/setup.py
+++ b/soledad_server/setup.py
@@ -34,6 +34,7 @@ install_requirements = [
'six==1.1.0',
'routes',
'PyOpenSSL',
+ 'leap.soledad>=0.2.1',
]