Branch 'pykolab-0.4' - 3 commits - bin/kolab_smtp_access_policy.py configure.ac share/templates

[Jeroen van Meeuwen]

 bin/kolab_smtp_access_policy.py |   12 ++++++++++++
 configure.ac                    |    4 ++--
 share/templates/cyrus.conf.tpl  |   12 +++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 7002e11db67d863ab8f5aaa7af01c56e11afdfec
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 28 14:17:42 2012 +0200

    Release 0.4.8

diff --git a/configure.ac b/configure.ac
index 648799a..3b83e52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([pykolab], 0.4.7)
-AC_SUBST([RELEASE], 3)
+AC_INIT([pykolab], 0.4.8)
+AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit dab9f09e2fb19652611e07353c126d90aef5312a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 28 14:11:06 2012 +0200

    Introduce a timeout for requests that end prematurely and never reach the data protocol state (#780)

diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py
index bc53278..ed1ce21 100755
--- a/bin/kolab_smtp_access_policy.py
+++ b/bin/kolab_smtp_access_policy.py
@@ -1222,12 +1222,18 @@ def read_request_input():
         containing the request.
     """
 
+    start_time = time.time()
+
     log.debug(_("Starting to loop for new request"))
 
     policy_request = {}
 
     end_of_request = False
     while not end_of_request:
+        if (time.time()-start_time) >= conf.timeout:
+            log.warning(_("Timeout for policy request reading exceeded"))
+            sys.exit(1)
+
         request_line = sys.stdin.readline()
         if request_line.strip() == '':
             if policy_request.has_key('request'):
@@ -1268,6 +1274,12 @@ if __name__ == "__main__":
             _("Access Policy Options")
         )
 
+    access_policy_group.add_option(  "--timeout",
+                            dest    = "timeout",
+                            action  = "store",
+                            default = 10,
+                            help    = _("SMTP Policy request timeout."))
+
     access_policy_group.add_option(  "--verify-recipient",
                             dest    = "verify_recipient",
                             action  = "store_true",


commit a39311109485ac73425afff0521af5f772ff63e7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 25 16:37:54 2012 +0100

    Make sure squatter runs regularly (#801)

diff --git a/share/templates/cyrus.conf.tpl b/share/templates/cyrus.conf.tpl
index 9d6ac0f..056c210 100644
--- a/share/templates/cyrus.conf.tpl
+++ b/share/templates/cyrus.conf.tpl
@@ -37,8 +37,18 @@ EVENTS {
 
     # this is only necessary if using duplicate delivery suppression,
     # Sieve or NNTP
-    delprune	cmd="cyr_expire -E 3" at=0400
+    duplicate_prune cmd="cyr_expire -E 3" at=0400
+
+    # Expire data older then 69 days. Two full months of 31 days
+    # each includes two full backup cycles, plus 1 week margin
+    # because we run our full backups on the first sat/sun night
+    # of each month.
+    delete_prune cmd="cyr_expire -E 4 -D 69" at=0430
+    expunge_prune cmd="cyr_expire -E 4 -X 69" at=0445
 
     # this is only necessary if caching TLS sessions
     tlsprune	cmd="tls_prune" at=0400
+
+    # Create search indexes regularly
+    squatter    cmd="squatter -s -i" at=0530
 }