summaryrefslogtreecommitdiff
path: root/service/pixelated/config/soledad.py
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2015-01-28 13:39:11 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-01-28 13:39:11 +0100
commitc49aa556e3ea0f152478f455ab2859d30acede7d (patch)
tree5d617fe2780eeb125a4f0fb02d6fe7ec20309167 /service/pixelated/config/soledad.py
parent607f8abaf33c273b06f1ddebadbf08da996b1d26 (diff)
(Re-)added leap home parameter to soledad initialization.
- Problem introduced with commit 26b85d8e52 - Issues #237 #232 #196
Diffstat (limited to 'service/pixelated/config/soledad.py')
-rw-r--r--service/pixelated/config/soledad.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/service/pixelated/config/soledad.py b/service/pixelated/config/soledad.py
index 3a033f09..13a6dbd4 100644
--- a/service/pixelated/config/soledad.py
+++ b/service/pixelated/config/soledad.py
@@ -17,10 +17,11 @@
from pixelated.bitmask_libraries.session import open as open_leap_session
-def init_soledad_and_user_key(app):
+def init_soledad_and_user_key(app, leap_home):
leap_session = open_leap_session(app['LEAP_USERNAME'],
app['LEAP_PASSWORD'],
- app['LEAP_SERVER_NAME'])
+ app['LEAP_SERVER_NAME'],
+ leap_home)
soledad = leap_session.soledad_session.soledad
soledad.sync(defer_decryption=False)
leap_session.nicknym.generate_openpgp_key()