Merge branch 'develop' into debian/platform-0.8

3 files changed, 12 insertions, 1 deletions

diff --git a/pkg/mx.conf.sample b/pkg/mx.conf.sample
index c9ad0f8..a649b73 100644
--- a/pkg/mx.conf.sample
+++ b/pkg/mx.conf.sample
@@ -14,6 +14,9 @@ port=4242
 [check recipient]
 port=2244
 
+[fingerprint map]
+port=2424
+
 [bounce]
 from=<address for the From: of the bounce email without domain>
 subject=Delivery failure
\ No newline at end of file
diff --git a/pkg/mx.tac b/pkg/mx.tac
index 4ae08f2..42d40a8 100755
--- a/pkg/mx.tac
+++ b/pkg/mx.tac
@@ -24,6 +24,7 @@ from leap.mx import couchdbhelper
 from leap.mx.mail_receiver import MailReceiver
 from leap.mx.alias_resolver import AliasResolverFactory
 from leap.mx.check_recipient_access import CheckRecipientAccessFactory
+from leap.mx.fingerprint_resolver import FingerprintResolverFactory
 
 try:
     from twisted.application import service, internet
@@ -57,6 +58,7 @@ except ConfigParser.NoSectionError:
 
 alias_port = config.getint("alias map", "port")
 check_recipient_port = config.getint("check recipient", "port")
+fingerprint_port = config.getint("fingerprint map", "port")
 
 cdb = couchdbhelper.ConnectedCouchDB(server,
                                      port=port,
@@ -79,6 +81,12 @@ check_recipient = internet.TCPServer(
     interface="localhost")
 check_recipient.setServiceParent(application)
 
+# Fingerprint map
+fingerprint_map = internet.TCPServer(
+    fingerprint_port, FingerprintResolverFactory(couchdb=cdb),
+    interface="localhost")
+fingerprint_map.setServiceParent(application)
+
 # Mail receiver
 directories = []
 for section in config.sections():
diff --git a/pkg/requirements-leap.pip b/pkg/requirements-leap.pip
index 482d1e2..23ebb69 100644
--- a/pkg/requirements-leap.pip
+++ b/pkg/requirements-leap.pip
@@ -1,3 +1,3 @@
 leap.common>=0.3.5
-leap.soledad.common>=0.4.5
+leap.soledad.common>=0.8.0
 leap.keymanager>=0.3.4