pykolab/setup share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Dec 9 13:01:58 CET 2014


 pykolab/setup/setup_roundcube.py                 |    6 ++++++
 share/templates/roundcubemail/config.inc.php.tpl |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5f711b830a66fd1795953193b8bfb82986568193
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Dec 9 13:01:47 2014 +0100

    Configure the skin based on the available skins

diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index 259f676..d7442b4 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -88,6 +88,12 @@ def execute(*args, **kw):
             'conf': conf
         }
 
+    if os.access('/usr/share/roundcubemail/skins/enterprise/', os.R_OK):
+        rc_settings['skin'] = 'enterprise'
+    elif os.access('/usr/share/roundcubemail/skin/chameleon/', os_R_OK):
+        rc_settings['skin'] = 'chameleon'
+    else:
+        rc_settings['skin'] = 'larry'
 
     want_files = [
             'acl.inc.php',
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 6383a5c..15cd25f 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -128,7 +128,7 @@
     \$config['ldap_debug'] = false;
     \$config['smtp_debug'] = false;
 
-    \$config['skin'] = 'chameleon';
+    \$config['skin'] = '$skin';
     \$config['skin_include_php'] = false;
     \$config['mime_magic'] = null;
     \$config['im_identify_path'] = '/usr/bin/identify';




More information about the commits mailing list