3 commits - conf/kolab.conf kolabd/__init__.py pykolab/conf pykolab/setup

[Jeroen van Meeuwen]

 conf/kolab.conf                  |    4 ++++
 kolabd/__init__.py               |    6 +++++-
 pykolab/conf/defaults.py         |    3 +++
 pykolab/setup/setup_mta.py       |    2 +-
 pykolab/setup/setup_syncroton.py |    9 ++++++---
 5 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 1da7b81cebf9bb2fd9485e5af3f59ede9a31b4c0
Author: Timotheus Pokorra (TBits.net) <tp at tbits.net>
Date:   Tue Aug 19 15:11:29 2014 +0200

    Bug #2491: sleep time until new domains are created should be optionally set in configuration file

diff --git a/conf/kolab.conf b/conf/kolab.conf
index 80d1f53..654c38e 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -22,6 +22,10 @@ default_locale = en_US
 ; deployments that lack persistent search and syncrepl ldap controls.
 sync_interval = 300
 
+; Synchronization interval for domains - describes the number of seconds
+; to wait in between polls for new and deleted domain name spaces.
+domain_sync_interval = 600
+
 ; The policy to use when originally composing the uid attribute value.
 ; Normally '%(surname)s.lower()', the transliterated value of the 'sn',
 ; in all lower-case.
diff --git a/kolabd/__init__.py b/kolabd/__init__.py
index 54905f6..92a929c 100644
--- a/kolabd/__init__.py
+++ b/kolabd/__init__.py
@@ -269,7 +269,11 @@ class KolabDaemon(object):
                     added_domains.append(domain)
 
             if len(removed_domains) == 0 and len(added_domains) == 0:
-                time.sleep(600)
+                try:
+                    sleep_between_domain_operations_in_seconds = (float)(conf.get('kolab', 'domain_sync_interval'))
+                    time.sleep(sleep_between_domain_operations_in_seconds)
+                except ValueError:
+                    time.sleep(600)
 
             log.debug(
                     _("added domains: %r, removed domains: %r") % (
diff --git a/pykolab/conf/defaults.py b/pykolab/conf/defaults.py
index 56abe6c..06e5372 100644
--- a/pykolab/conf/defaults.py
+++ b/pykolab/conf/defaults.py
@@ -33,5 +33,8 @@ class Defaults(object):
         self.mail_attributes = ['mail', 'alias']
         self.mailserver_attribute = 'mailhost'
 
+        # when you want a new domain to be added in a short time, you should reduce this value to 10 seconds
+        self.kolab_domain_sync_interval = 600
+
         self.kolab_default_locale = 'en_US'
         self.ldap_unique_attribute = 'nsuniqueid'
\ No newline at end of file


commit ee82a914da00c1f0133240abc4767ac01f4c27ea
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 14:02:30 2014 +0200

    Bug #3156 - wrong sender_login_maps

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 7898599..88c6f6c 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -260,7 +260,7 @@ result_format = shared+%%s
             "smtpd_tls_security_level": "may",
             "smtp_tls_security_level": "may",
             "smtpd_sasl_auth_enable": "yes",
-            "smtpd_sender_login_maps": "$relay_recipient_maps",
+            "smtpd_sender_login_maps": "$local_recipient_maps",
             "smtpd_sender_restrictions": "permit_mynetworks, reject_sender_login_mismatch",
             "smtpd_recipient_restrictions": "permit_mynetworks, reject_unauth_pipelining, reject_rbl_client zen.spamhaus.org, reject_non_fqdn_recipient, reject_invalid_helo_hostname, reject_unknown_recipient_domain, reject_unauth_destination, check_policy_service unix:private/recipient_policy_incoming, permit",
             "smtpd_sender_restrictions": "permit_mynetworks, check_policy_service unix:private/sender_policy_incoming",


commit ff5031a3d8f1b30857628b670da1758d345be530
Author: Aeneas Jaißle <aj at ajaissle.de>
Date:   Tue Aug 19 13:52:46 2014 +0200

    Fix #3391: setup-kolab syncroton fails on openSUSE. The setup script tries an os.walk to find msql.initial.sql, but has a 'break' stopping the walk from going one (needed) level deeper.

diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py
index 2f401bd..e0477b1 100644
--- a/pykolab/setup/setup_syncroton.py
+++ b/pykolab/setup/setup_syncroton.py
@@ -44,15 +44,18 @@ def execute(*args, **kw):
     for root, directories, filenames in os.walk('/usr/share/doc/'):
         for directory in directories:
             if directory.startswith("kolab-syncroton"):
-                for root, directories, filenames in os.walk(os.path.join('/usr/share/doc/', directory)):
+                for root, directories, filenames in os.walk(os.path.join(root, directory)):
                     for filename in filenames:
                         if filename.startswith('mysql.initial') and filename.endswith('.sql'):
                             schema_filepath = os.path.join(root,filename)
                             if not schema_filepath in schema_files:
                                 schema_files.append(schema_filepath)
+                                break
 
-                break
-        break
+                if len(schema_files) > 0
+                    break
+        if len(schema_files) > 0
+            break
 
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
         utils.multiline_message(