Merge branch 'develop' into release-0.7.x0.7.0release-0.7.x

5 files changed, 4 insertions, 5 deletions

diff --git a/pkg/leap_mx b/pkg/leap_mx.init
index 60dddc4..60dddc4 100644
--- a/pkg/leap_mx
+++ b/pkg/leap_mx.init
diff --git a/setup.py b/setup.py
index 6fec416..3e89eec 100644
--- a/setup.py
+++ b/setup.py
@@ -113,8 +113,7 @@ else:
     # be automatically
     # placed by distutils, using whatever interpreter is
     # available.
-    data_files = [("/usr/local/bin/", ["pkg/mx.tac"]),
-                  ("/etc/init.d/", ["pkg/leap_mx"])]
+    data_files = [("/usr/local/bin/", ["pkg/mx.tac"])]
 setup(
     name='leap.mx',
     version=VERSION,
diff --git a/src/leap/mx/alias_resolver.py b/src/leap/mx/alias_resolver.py
index c6f2acc..bf7a58b 100644
--- a/src/leap/mx/alias_resolver.py
+++ b/src/leap/mx/alias_resolver.py
@@ -77,4 +77,4 @@ class AliasResolverFactory(LEAPPostfixTCPMapServerFactory):
 
     @property
     def _query_message(self):
-        return "Resolving alias for"
+        return "virtual alias map"
diff --git a/src/leap/mx/check_recipient_access.py b/src/leap/mx/check_recipient_access.py
index 55460a6..f994e78 100644
--- a/src/leap/mx/check_recipient_access.py
+++ b/src/leap/mx/check_recipient_access.py
@@ -84,5 +84,5 @@ class CheckRecipientAccessFactory(LEAPPostfixTCPMapServerFactory):
 
     @property
     def _query_message(self):
-        return "Checking recipient access for"
+        return "check recipient access"
 
diff --git a/src/leap/mx/tcp_map.py b/src/leap/mx/tcp_map.py
index 597c830..96db70a 100644
--- a/src/leap/mx/tcp_map.py
+++ b/src/leap/mx/tcp_map.py
@@ -66,7 +66,7 @@ class LEAPPostfixTCPMapServerFactory(ServerFactory, object):
                  and pgp key.
         :rtype: Deferred
         """
-        log.msg("%s %s" % (self._query_message, lookup_key,))
+        log.msg("%s: %s" % (self._query_message, lookup_key,))
         d = self._cdb.getUuidAndPubkey(lookup_key)
         d.addErrback(log.err)
         return d