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 /server/src/leap | |
| parent | 2121d21945ef7458eb57c3cab53a98b92fce1417 (diff) | |
| parent | 147986547f400f79e8bc0d50af5ae7b5d2a140b4 (diff) | |
Merge branch 'soledad_configdir' into develop
Diffstat (limited to 'server/src/leap')
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 1273d15c..f64d07bf 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -304,7 +304,7 @@ def load_configuration(file_path): # ---------------------------------------------------------------------------- def application(environ, start_response): - conf = load_configuration('/etc/leap/soledad-server.conf') + conf = load_configuration('/etc/soledad/soledad-server.conf') state = CouchServerState(conf['couch_url'], create_cmd=conf['create_cmd']) # WSGI application that may be used by `twistd -web` application = GzipMiddleware( |