diff options
| author | drebs <drebs@leap.se> | 2016-11-27 12:02:27 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-11-27 12:02:27 -0200 |
| commit | f072f18f317ea31e66c7890d672b5d2fd9f3ef14 (patch) | |
| tree | db18a701bbefdb9a5e71f814f5ff1263c2fa821d /server/pkg | |
| parent | 564f55802455d08c9a38e892bb4b25ad6fbcb87d (diff) | |
| parent | dff666e51240393ebbf2a2118e6e51130fe91f8c (diff) | |
Merge tag '0.9.1'
Tag version 0.9.1
# gpg: Signature made Sun 27 Nov 2016 12:01:10 PM BRST
# gpg: using RSA key 0x6071E70DCACC60B2
# gpg: a verificar a base de dados de confiança
# gpg: public key of ultimately trusted key 0x030F1C082D2327BE not found
# gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
# gpg: depth: 0 valid: 11 signed: 71 trust: 0-, 0q, 0n, 0m, 0f, 11u
# gpg: depth: 1 valid: 71 signed: 64 trust: 69-, 0q, 0n, 0m, 2f, 0u
# gpg: depth: 2 valid: 55 signed: 74 trust: 55-, 0q, 0n, 0m, 0f, 0u
# gpg: proxima verificação da base de dados de confiança a 2016-12-12
# gpg: Good signature from "drebs (work key) <db@leap.se>" [ultimate]
# gpg: aka "drebs (work key) <drebs@leap.se>" [ultimate]
# Impressão da chave primária: 9F73 295B 6306 E06F 3151 99AE 6071 E70D CACC 60B2
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" |