diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-10-05 16:59:23 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2015-10-05 16:59:23 +0200 |
| commit | 214b9057efc8a0524e4a0e6b988e8f531795510d (patch) | |
| tree | 93e9db738ba5c7b8a3ef0fdebe5be1ca5a646040 /scripts/db_access | |
| parent | 2121d21945ef7458eb57c3cab53a98b92fce1417 (diff) | |
| parent | 147986547f400f79e8bc0d50af5ae7b5d2a140b4 (diff) | |
Merge branch 'soledad_configdir' into develop
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 |