6 commits - configure.ac conf/kolab.conf pykolab/plugins pykolab/setup share/templates

[Jeroen van Meeuwen]

 conf/kolab.conf                             |    3 +++
 configure.ac                                |    2 +-
 pykolab/plugins/recipientpolicy/__init__.py |    2 +-
 pykolab/setup/setup_mta.py                  |    4 ++++
 share/templates/master.cf.tpl               |    4 ++--
 5 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 15f07fd7ac0031c67ae33c94e7f0af85fb8adc3d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:24:22 2012 +0100

    Bump pre-release

diff --git a/configure.ac b/configure.ac
index d5e0226..0939ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.11)
+AC_SUBST([RELEASE], 0.12)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit df981ed2a84c35ab66a6ab82a87a645a57b424fc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:24:04 2012 +0100

    Start wallace with setup

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 452b2b4..4998acf 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -291,6 +291,8 @@ result_attribute = mail
         subprocess.call(['systemctl', 'enable', 'amavisd.service'])
         subprocess.call(['systemctl', 'restart', 'clamd.amavisd.service'])
         subprocess.call(['systemctl', 'enable', 'clamd.amavisd.service'])
+        subprocess.call(['systemctl', 'restart', 'wallace.service'])
+        subprocess.call(['systemctl', 'enable', 'wallace.service'])
     elif os.path.isfile('/sbin/service'):
         subprocess.call(['service', 'postfix', 'restart'])
         subprocess.call(['chkconfig', 'postfix', 'on'])
@@ -298,6 +300,8 @@ result_attribute = mail
         subprocess.call(['chkconfig', 'amavisd', 'on'])
         subprocess.call(['service', 'clamd.amavisd', 'restart'])
         subprocess.call(['chkconfig', 'clamd.amavisd', 'on'])
+        subprocess.call(['service', 'wallace', 'restart'])
+        subprocess.call(['chkconfig', 'wallace', 'on'])
     else:
         log.error(_("Could not start and configure to start on boot, the " + \
                 "postfix, clamav.amavisd and amavisd services."))


commit 25ed51dacc8bf40518dc4ee932cfa8e296171809
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:21:49 2012 +0100

    Supply default for default_locale in the default configuration

diff --git a/conf/kolab.conf b/conf/kolab.conf
index 2b70116..2c5123a 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -14,6 +14,9 @@ auth_mechanism = ldap
 ; 'cyrus-imap'.
 imap_backend = cyrus-imap
 
+; The default locale for this Kolab Groupware installation
+default_locale = en_US
+
 [ldap]
 ; The URI to LDAP
 ldap_uri = ldap://localhost:389


commit fe80686531bcb8f68b3fa4beef5b277152046ffb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:20:53 2012 +0100

    Pull the correct default locale (#883)

diff --git a/pykolab/plugins/recipientpolicy/__init__.py b/pykolab/plugins/recipientpolicy/__init__.py
index 1c97857..9d50e83 100644
--- a/pykolab/plugins/recipientpolicy/__init__.py
+++ b/pykolab/plugins/recipientpolicy/__init__.py
@@ -64,7 +64,7 @@ class KolabRecipientpolicy(object):
         if not user_attrs.has_key('preferredlanguage'):
             default_locale = conf.get(user_attrs['domain'], 'default_locale')
             if default_locale == None:
-                default_locale = conf.get(user_attrs['domain'], 'default_locale')
+                default_locale = conf.get('kolab', 'default_locale')
             if default_locale == None:
                 default_locale = 'en_US'
 


commit 06acf4fbccf0d9f2a986145116aef45eb754e517
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:19:56 2012 +0100

    Enable wallace content filtering by default

diff --git a/share/templates/master.cf.tpl b/share/templates/master.cf.tpl
index d0ec699..7fa7dac 100644
--- a/share/templates/master.cf.tpl
+++ b/share/templates/master.cf.tpl
@@ -135,7 +135,7 @@ smtp-amavis     unix    -   -   n   -       3   smtp
 # Listener to re-inject email from Amavisd into Postfix
 #
 127.0.0.1:10025 inet    n   -   n   -       100 smtpd
-    -o content_filter=
+    -o content_filter=smtp-wallace:[127.0.0.1]:10026
     -o local_recipient_maps=
     -o relay_recipient_maps=
     -o smtpd_restriction_classes=


commit f4fc482d5317e35759448b986a85e6900e680d98
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jul 16 13:19:28 2012 +0100

    Fix typo

diff --git a/share/templates/master.cf.tpl b/share/templates/master.cf.tpl
index df22651..d0ec699 100644
--- a/share/templates/master.cf.tpl
+++ b/share/templates/master.cf.tpl
@@ -132,7 +132,7 @@ smtp-amavis     unix    -   -   n   -       3   smtp
     -o max_use=20
 
 #
-# Listener to re-inject email from Amavsid into Postfix
+# Listener to re-inject email from Amavisd into Postfix
 #
 127.0.0.1:10025 inet    n   -   n   -       100 smtpd
     -o content_filter=