diff options
| author | drebs <drebs@leap.se> | 2016-11-27 12:03:13 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-11-27 12:03:13 -0200 |
| commit | 5b2e52200eb815b598e7ed74bb7b4e21387d9c08 (patch) | |
| tree | db18a701bbefdb9a5e71f814f5ff1263c2fa821d /server/pkg | |
| parent | 428fdf65dd6a4e9196d8eb82905aec38ccfc35ca (diff) | |
| parent | dff666e51240393ebbf2a2118e6e51130fe91f8c (diff) | |
Merge tag '0.9.1' into develop
Tag version 0.9.1
Diffstat (limited to 'server/pkg')
| -rwxr-xr-x | server/pkg/create-user-db | 2 | ||||
| -rw-r--r-- | server/pkg/soledad-server | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index b955b4c3..9e2b6b50 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -22,7 +22,7 @@ import argparse from leap.soledad.common.couch import CouchDatabase from leap.soledad.common.couch.state import is_db_name_valid from leap.soledad.common.couch import list_users_dbs -from leap.soledad.server import load_configuration +from leap.soledad.server.config import load_configuration BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False) diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index 9dada6a0..d9dab040 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -11,7 +11,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid -OBJ=leap.soledad.server.application +OBJ=leap.soledad.server.application.wsgi_application HTTPS_PORT=2424 CONFDIR=/etc/soledad CERT_PATH="${CONFDIR}/soledad-server.pem" |