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 /scripts/migration/0.9.0/migrate.py | |
| 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 'scripts/migration/0.9.0/migrate.py')
| -rwxr-xr-x | scripts/migration/0.9.0/migrate.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/migration/0.9.0/migrate.py b/scripts/migration/0.9.0/migrate.py index 6ad5bc2d..7b2ec005 100755 --- a/scripts/migration/0.9.0/migrate.py +++ b/scripts/migration/0.9.0/migrate.py @@ -27,14 +27,14 @@ import os from argparse import ArgumentParser -from leap.soledad.server import load_configuration +from leap.soledad.server import get_config from migrate_couch_schema import migrate TARGET_VERSION = '0.8.2' DEFAULT_COUCH_URL = 'http://127.0.0.1:5984' -CONF = load_configuration('/etc/soledad/soledad-server.conf') +CONF = get_config() NETRC_PATH = CONF['soledad-server']['admin_netrc'] |