diff options
| author | drebs <drebs@leap.se> | 2013-09-04 09:10:25 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-09-04 09:10:25 -0300 |
| commit | 256f129c50ee232dc35043dface166780e3c1553 (patch) | |
| tree | 8f765b99d94614d09ee7083123cf4341fe8d34a1 | |
| parent | df9c43ec8d239595a40602b0e94125484a2144b2 (diff) | |
| parent | fa3f18d1455d9d1cdb63d52af05ad014c0aee47e (diff) | |
Merge remote-tracking branch 'chiiph/bug/fix_init_script' into develop
| -rw-r--r-- | server/changes/bug_init_script | 2 | ||||
| -rw-r--r-- | server/pkg/soledad | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
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 |