diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
| commit | 9975e9b4ecc553d13a5e5b283257af9fedab51bf (patch) | |
| tree | ce360620d46ec010a5af0035eb99394c86bdf26f /scripts/db_access | |
| parent | be2a2966ec6c8d8608424cf934a9313de3cac822 (diff) | |
| parent | 16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff) | |
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'scripts/db_access')
| -rw-r--r-- | scripts/db_access/reset_db.py | 2 | ||||
| -rw-r--r-- | scripts/db_access/server_side_db.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/db_access/reset_db.py b/scripts/db_access/reset_db.py index 7c6d281b..c48b511e 100644 --- a/scripts/db_access/reset_db.py +++ b/scripts/db_access/reset_db.py @@ -63,7 +63,7 @@ def get_url(empty): if empty is False: # get couch url cp = ConfigParser() - cp.read('/etc/leap/soledad-server.conf') + cp.read('/etc/soledad/soledad-server.conf') url = cp.get('soledad-server', 'couch_url') else: with open('/etc/couchdb/couchdb.netrc') as f: diff --git a/scripts/db_access/server_side_db.py b/scripts/db_access/server_side_db.py index 18641a0f..fcdd14b6 100644 --- a/scripts/db_access/server_side_db.py +++ b/scripts/db_access/server_side_db.py @@ -1,7 +1,7 @@ #!/usr/bin/python # This script gives server-side access to one Soledad user database by using -# the configuration stored in /etc/leap/soledad-server.conf. +# the configuration stored in /etc/soledad/soledad-server.conf. # # Use it like this: # @@ -20,7 +20,7 @@ uuid = sys.argv[1] # get couch url cp = ConfigParser() -cp.read('/etc/leap/soledad-server.conf') +cp.read('/etc/soledad/soledad-server.conf') url = cp.get('soledad-server', 'couch_url') # access user db |