2 commits - saslauthd/__init__.py share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun Aug 24 14:16:15 CEST 2014


 saslauthd/__init__.py                            |    8 ++++----
 share/templates/roundcubemail/config.inc.php.tpl |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit afdbc23d4b157a8e5449531896e0e0f01ce6fc4b
Author: Aeneas Jaißle <aj at ajaissle.de>
Date:   Sun Aug 24 14:04:57 2014 +0200

    Actually use the socket configured

diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
index b7f81d5..6590747 100644
--- a/saslauthd/__init__.py
+++ b/saslauthd/__init__.py
@@ -170,13 +170,13 @@ class SASLAuthDaemon(object):
 
         # TODO: The saslauthd socket path could be a setting.
         try:
-            os.remove('/var/run/saslauthd/mux')
+            os.remove(socketfile)
         except:
             # TODO: Do the "could not remove, could not start" dance
             pass
 
-        s.bind('/var/run/saslauthd/mux')
-        os.chmod('/var/run/saslauthd/mux', 0777)
+        s.bind(socketfile)
+        os.chmod(socketfile, 0777)
 
         s.listen(5)
 
@@ -271,7 +271,7 @@ class SASLAuthDaemon(object):
 
     def _ensure_socket_dir(self):
         utils.ensure_directory(
-                '/var/run/saslauthd/',
+                os.path.dirname(socketfile),
                 conf.process_username,
                 conf.process_groupname
             )


commit 3aa398fd8c4836868d5223638d3318bd64c337b6
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 21 10:19:34 2014 +0200

    Correct assets path

diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 920423e..61214f2 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -7,7 +7,7 @@
     \$config['des_key'] = "$des_key";
     \$config['username_domain'] = '$primary_domain';
     \$config['use_secure_urls'] = true;
-    \$config['assets_path'] = '/roundcubemail/assets/';
+    \$config['assets_path'] = '/assets/';
 
     \$config['mail_domain'] = '';
 




More information about the commits mailing list