Branch 'pykolab-0.4' - 4 commits - kolabd/kolabd.sysconfig kolabd/kolabd.systemd pykolab/auth pykolab/setup

[Jeroen van Meeuwen]

 kolabd/kolabd.sysconfig          |    3 ++-
 kolabd/kolabd.systemd            |    2 ++
 pykolab/auth/ldap/__init__.py    |    2 +-
 pykolab/setup/setup_freebusy.py  |    3 +++
 pykolab/setup/setup_mta.py       |    2 +-
 pykolab/setup/setup_roundcube.py |    3 +++
 pykolab/setup/setup_zpush.py     |    3 +++
 7 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 36de4f59212e42d6c7cdcc05312b37a32ff8d812
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 10:18:35 2012 +0100

    cache_entry is an object with attributes, not a dictionary (#784)

diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index a5e1042..7cdb018 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -931,7 +931,7 @@ class LDAP(pykolab.base.Base):
 
         cache_entry = cache.get_entry(self.domain, entry)
         if not cache_entry == None:
-            old_canon_attr = cache_entry['result_attribute']
+            old_canon_attr = cache_entry.result_attribute
 
         # See if we have to trigger the recipient policy. Only really applies to
         # situations in which the result_attribute is used in the old or in the


commit 7512c5ede80512844d923b4b170a426f84d63279
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 17 13:24:51 2012 +0100

    Rename search_filter => query_filter (#782)

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index c86e57c..c305267 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -170,7 +170,7 @@ domain = ldap:/etc/postfix/ldap/mydestination.cf
 bind_dn = %(service_bind_dn)s
 bind_pw = %(service_bind_pw)s
 
-search_filter = (&(|(mail=%%s)(alias=%%s))(objectclass=kolabinetorgperson))
+query_filter = (&(|(mail=%%s)(alias=%%s))(objectclass=kolabinetorgperson))
 result_attribute = mail
 """ % {
                         "base_dn": conf.get('ldap', 'base_dn'),


commit b459ff1ff9a86a27c9008ad1cc2bff586e7b725c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 17 12:59:54 2012 +0100

    Sleep 2 seconds before attempting to restart the httpd service (#773)

diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 3b522f1..22c74c4 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -21,6 +21,7 @@ from Cheetah.Template import Template
 import os
 import subprocess
 import sys
+import time
 
 import components
 
@@ -106,6 +107,8 @@ def execute(*args, **kw):
             fp.write(t.__str__())
             fp.close()
 
+    time.sleep(2)
+
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
         subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index ad23d6c..5970a65 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -24,6 +24,7 @@ import random
 import re
 import subprocess
 import sys
+import time
 
 import components
 
@@ -170,6 +171,8 @@ def execute(*args, **kw):
     p1.stdout.close()
     p2.communicate()
 
+    time.sleep(2)
+
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
         subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
diff --git a/pykolab/setup/setup_zpush.py b/pykolab/setup/setup_zpush.py
index 01739c3..3aa7a0b 100644
--- a/pykolab/setup/setup_zpush.py
+++ b/pykolab/setup/setup_zpush.py
@@ -21,6 +21,7 @@ from Cheetah.Template import Template
 import os
 import subprocess
 import sys
+import time
 
 import components
 
@@ -85,6 +86,8 @@ def execute(*args, **kw):
             fp.write(t.__str__())
             fp.close()
 
+    time.sleep(2)
+
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
         subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])


commit c2a9e61860543d0d44e48fdf6c0eb97123e2981b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 17 10:04:29 2012 +0100

    Set kolabd to run as kolab:kolab (systemd) or with daemon options --user kolab

diff --git a/kolabd/kolabd.sysconfig b/kolabd/kolabd.sysconfig
index 0705f32..93d27b5 100644
--- a/kolabd/kolabd.sysconfig
+++ b/kolabd/kolabd.sysconfig
@@ -2,4 +2,5 @@
 #
 # See kolabd --help for more flags.
 #
-FLAGS="--fork -l warning"
\ No newline at end of file
+FLAGS="--fork -l warning"
+DAEMONOPTS="--user kolab"
diff --git a/kolabd/kolabd.systemd b/kolabd/kolabd.systemd
index 80305f8..92db05e 100644
--- a/kolabd/kolabd.systemd
+++ b/kolabd/kolabd.systemd
@@ -5,6 +5,8 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/kolabd/kolabd.pid
+User=kolab
+Group=kolab
 EnvironmentFile=/etc/sysconfig/kolabd
 ExecStart=/usr/sbin/kolabd $FLAGS
 ExecReload=/bin/kill -HUP $MAINPID