summaryrefslogtreecommitdiff
path: root/server/pkg/create-user-db
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-10-06 10:56:27 -0400
committerKali Kaneko <kali@leap.se>2015-10-06 10:56:27 -0400
commit9975e9b4ecc553d13a5e5b283257af9fedab51bf (patch)
treece360620d46ec010a5af0035eb99394c86bdf26f /server/pkg/create-user-db
parentbe2a2966ec6c8d8608424cf934a9313de3cac822 (diff)
parent16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff)
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'server/pkg/create-user-db')
-rwxr-xr-xserver/pkg/create-user-db3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db
index 1a7e77a7..7eafc945 100755
--- a/server/pkg/create-user-db
+++ b/server/pkg/create-user-db
@@ -21,6 +21,7 @@ import netrc
import argparse
from leap.soledad.common.couch import CouchDatabase
from leap.soledad.common.couch import is_db_name_valid
+from leap.soledad.server import load_configuration
description = """
@@ -30,7 +31,7 @@ This is meant to be used by Soledad Server.
parser = argparse.ArgumentParser(description=description)
parser.add_argument('dbname', metavar='user-d34db33f', type=str,
help='database name on the format user-{uuid4}')
-NETRC_PATH = '/etc/couchdb/couchdb-admin.netrc'
+NETRC_PATH = load_configuration('/etc/soledad/soledad-server.conf')['admin_netrc']
def url_for_db(dbname):