From 6cabe46e4671627c22d5eed9ebb3bdc751948414 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Sun, 12 Feb 2017 20:33:48 +0100 Subject: [refactor] update create-user-db script to use config refactor --- server/pkg/create-user-db | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'server/pkg/create-user-db') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 9e2b6b50..fe1a99a0 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -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) -- cgit v1.2.3 From 12e14b761d4669a2f654d870d444356623ffc56f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 13 Feb 2017 14:19:49 +0100 Subject: [bug] fix import typo on create-user-db --- server/pkg/create-user-db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg/create-user-db') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index fe1a99a0..5cc1754b 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) -- cgit v1.2.3 From 19dfe7e9d1f1862026e768301da2ee1273ec7f9f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 13 Feb 2017 14:28:07 +0100 Subject: [bug] fix typo, again --- server/pkg/create-user-db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg/create-user-db') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 5cc1754b..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 get_config +from leap.soledad.server._config import get_config BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False) -- cgit v1.2.3