3 commits - pykolab/setup pykolab/wap_client share/templates

[Jeroen van Meeuwen]

 pykolab/setup/setup_mta.py                         |    4 ++--
 pykolab/wap_client/__init__.py                     |   20 ++++++++++++++++++--
 share/templates/roundcubemail/calendar.inc.php.tpl |    4 ++++
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit b7448315c76685b66a74368aa6bbfd70c5d7b531
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 10:50:57 2014 +0200

    Allow a URI to be passed on to connect()

diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
index 9549fe8..2199e9f 100644
--- a/pykolab/wap_client/__init__.py
+++ b/pykolab/wap_client/__init__.py
@@ -74,8 +74,24 @@ def authenticate(username=None, password=None, domain=None):
         session_id = response['session_token']
         return True
 
-def connect():
-    global conn
+def connect(uri=None):
+    global conn, API_SSL, API_PORT, API_HOSTNAME, API_BASE
+
+    if not uri == None:
+        result = urlparse(uri)
+
+        if hasattr(result, 'scheme') and result.scheme == 'https':
+            API_SSL = True
+            API_PORT = 443
+
+        if hasattr(result, 'hostname'):
+            API_HOSTNAME = result.hostname
+
+        if hasattr(result, 'port'):
+            API_PORT = result.port
+
+        if hasattr(result, 'path'):
+            API_BASE = result.path
 
     if conn == None:
         if API_SSL:


commit 2c3a0384bd5fca829a1e7b2b0de3dcb209169052
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 10:50:25 2014 +0200

    clamd.amavisd is actually clamd at amavisd

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 7cd1919..f38ee07 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -421,7 +421,7 @@ result_format = shared+%%s
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'restart', 'postfix.service'])
         subprocess.call(['systemctl', 'restart', 'amavisd.service'])
-        subprocess.call(['systemctl', 'restart', 'clamd.amavisd.service'])
+        subprocess.call(['systemctl', 'restart', 'clamd at amavisd.service'])
         subprocess.call(['systemctl', 'restart', 'wallace.service'])
     elif os.path.isfile('/sbin/service'):
         subprocess.call(['service', 'postfix', 'restart'])
@@ -439,7 +439,7 @@ result_format = shared+%%s
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'enable', 'postfix.service'])
         subprocess.call(['systemctl', 'enable', 'amavisd.service'])
-        subprocess.call(['systemctl', 'enable', 'clamd.amavisd.service'])
+        subprocess.call(['systemctl', 'enable', 'clamd at amavisd.service'])
         subprocess.call(['systemctl', 'enable', 'wallace.service'])
     elif os.path.isfile('/sbin/chkconfig'):
         subprocess.call(['chkconfig', 'postfix', 'on'])


commit c5e8514c602be65eec3bec91ab16ffddf15c9148
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 14 15:35:46 2014 +0200

    Improve the defaults for iTip sending on behalf of users not logged in.

diff --git a/share/templates/roundcubemail/calendar.inc.php.tpl b/share/templates/roundcubemail/calendar.inc.php.tpl
index 357c8ce..6ee1506 100644
--- a/share/templates/roundcubemail/calendar.inc.php.tpl
+++ b/share/templates/roundcubemail/calendar.inc.php.tpl
@@ -9,6 +9,10 @@
     \$config['calendar_event_coloring'] = 0;
     \$config['calendar_caldav_url'] = 'http://' . \$_SERVER['HTTP_HOST'] . '/iRony/calendars/%u/%i';
 
+    \$config['calendar_itip_smtp_server'] = '';
+    \$config['calendar_itip_smtp_user'] = '';
+    \$config['calendar_itip_smtp_pass'] = '';
+
     \$config['calendar_contact_birthdays'] = true;
 
     \$config['calendar_resources_driver'] = 'ldap';