Merge branch 'develop' into debian/platform-0.8

1 files changed, 8 insertions, 0 deletions

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():