diff options
| -rw-r--r-- | server/src/leap/soledad/server/auth.py | 2 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/entrypoint.py | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/server/src/leap/soledad/server/auth.py b/server/src/leap/soledad/server/auth.py index 0ec890ca..c5954c60 100644 --- a/server/src/leap/soledad/server/auth.py +++ b/server/src/leap/soledad/server/auth.py @@ -50,7 +50,7 @@ class SoledadRealm(object): def requestAvatar(self, avatarId, mind, *interfaces): if IResource in interfaces: - enable_blobs = self._conf['soledad-server']['blobs'] + enable_blobs = self._conf['blobs'] resource = SoledadResource( enable_blobs=enable_blobs, sync_pool=self._sync_pool) diff --git a/server/src/leap/soledad/server/entrypoint.py b/server/src/leap/soledad/server/entrypoint.py index 9cc1f97b..8078a54a 100644 --- a/server/src/leap/soledad/server/entrypoint.py +++ b/server/src/leap/soledad/server/entrypoint.py @@ -16,6 +16,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """ The entrypoint for Soledad server. + +This is the entrypoint for the application that is loaded from the initscript +or the systemd script. """ from twisted.internet import reactor @@ -26,21 +29,16 @@ from .session import SoledadSession # load configuration from file -conf = get_config +conf = get_config() class SoledadEntrypoint(SoledadSession): def __init__(self): - SoledadSession.__init__(self, conf) + SoledadSession.__init__(self) -# XXX FIXME ---------------------------- -# this is not executed from anywhere. -# what's the plan for this module? -# use me, or delete me. -# -------------------------------------- # see the comments in application.py recarding why couch state has to be # initialized when the reactor is running -reactor.callWhenRunning(init_couch_state, conf['soledad-server']) +reactor.callWhenRunning(init_couch_state, conf) |