summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-29 14:44:10 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-29 14:44:10 -0300
commitfa3f18d1455d9d1cdb63d52af05ad014c0aee47e (patch)
tree8f765b99d94614d09ee7083123cf4341fe8d34a1
parentdf9c43ec8d239595a40602b0e94125484a2144b2 (diff)
Use soledad.server namespace in init script
-rw-r--r--server/changes/bug_init_script2
-rw-r--r--server/pkg/soledad2
-rw-r--r--server/src/leap/soledad/server/__init__.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/server/changes/bug_init_script b/server/changes/bug_init_script
new file mode 100644
index 00000000..dc4fc322
--- /dev/null
+++ b/server/changes/bug_init_script
@@ -0,0 +1,2 @@
+ o Fix the init script for soledad server so that it uses the new
+ package namespace. \ No newline at end of file
diff --git a/server/pkg/soledad b/server/pkg/soledad
index c233731e..841233d1 100644
--- a/server/pkg/soledad
+++ b/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
CERT_PATH=/etc/leap/soledad-server.pem
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index 0c56acb9..67b0611d 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -20,7 +20,7 @@
A U1DB server that stores data using CouchDB as its persistence layer.
This should be run with:
- twistd -n web --wsgi=leap.soledad_server.application --port=2424
+ twistd -n web --wsgi=leap.soledad.server.application --port=2424
"""
import configparser