diff options
| author | drebs <drebs@leap.se> | 2017-03-11 14:38:51 +0100 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2017-03-11 14:38:51 +0100 |
| commit | 3ec21a7a6b39b4fe8885f3050ab75402e6812a1f (patch) | |
| tree | 300a2d8da67bbc7c6484f9ee136a4a18c41c48c6 /server/pkg/create-user-db | |
| parent | c379a58d84fbf061b8d046057e45089f0e3c65f6 (diff) | |
| parent | 3eefcb7d138ef41932a748ae729bfa0b629758d2 (diff) | |
Merge tag '0.9.3' into debian/platform-0.9
0.9.3
Conflicts:
server/pkg/soledad-server
server/pkg/soledad-server.service
Diffstat (limited to 'server/pkg/create-user-db')
| -rwxr-xr-x | server/pkg/create-user-db | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 9e2b6b50..5e0ef5e2 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.config import load_configuration +from leap.soledad.server._config import get_config BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False) @@ -38,8 +38,9 @@ parser.add_argument('dbname', metavar='user-d34db33f', type=str, help='database name on the format user-{uuid4}') parser.add_argument('--migrate-all', action='store_true', help="recreate all design docs for all existing account") -CONF = load_configuration('/etc/soledad/soledad-server.conf') -NETRC_PATH = CONF['soledad-server']['admin_netrc'] +CONF = get_config() +DBCONF = get_config(section='database-security') +NETRC_PATH = CONF['admin_netrc'] def url_for_db(dbname): @@ -78,7 +79,7 @@ def ensure_database(dbname): print ("Invalid name! %s" % dbname) sys.exit(1) url = url_for_db(dbname) - db_security = CONF['database-security'] + db_security = DBCONF db = CouchDatabase.open_database(url=url, create=True, replica_uid=None, database_security=db_security) |