3 commits - conf/kolab.conf share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed May 29 14:17:07 CEST 2013


 conf/kolab.conf                                |   15 ++++++++++-----
 share/templates/roundcubemail/main.inc.php.tpl |    6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 38793dbd91a0679cd581b04ca0d1bbc48f4b268d
Merge: 0b59f02 f9c5035
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 29 13:17:02 2013 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab



commit 0b59f02c25c9d846bcf0244c8e1f9270e3bbf817
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 29 13:16:42 2013 +0100

    Update default configuration for roundcube

diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index 00edc0e..9fe7f81 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -136,7 +136,7 @@
     \$rcmail_config['skin'] = 'larry';
     \$rcmail_config['skin_logo'] = 'skins/kolab/images/kolab_logo.png';
     \$rcmail_config['skin_include_php'] = false;
-    \$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
+    \$rcmail_config['mime_magic'] = null;
     \$rcmail_config['im_identify_path'] = '/usr/bin/identify';
     \$rcmail_config['im_convert_path'] = '/usr/bin/convert';
     \$rcmail_config['login_lc'] = true;
@@ -162,8 +162,8 @@
     \$rcmail_config['smtp_auth_pw'] = null;
     \$rcmail_config['smtp_helo_host'] = \$_SERVER["HTTP_HOST"];
     \$rcmail_config['smtp_timeout'] = 0;
-    \$rcmail_config['log_dir'] = '/var/log/roundcubemail/';
-    \$rcmail_config['temp_dir'] = '\${_tmppath}';
+    \$rcmail_config['log_dir'] = 'logs/';
+    \$rcmail_config['temp_dir'] = '/var/lib/roundcubemail/';
     \$rcmail_config['message_cache_lifetime'] = '10d';
 
     \$rcmail_config['archive_mbox'] = 'Archive';


commit 2d4353ef1efabdb5683488adbd49c01ecf1f0aef
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun May 19 16:42:22 2013 +0100

    Sort autocreate folders alphabetically, and add Files (#1882)

diff --git a/conf/kolab.conf b/conf/kolab.conf
index 0725b19..f98dca9 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -254,11 +254,6 @@ autocreate_folders = {
                         '/shared/vendor/kolab/folder-type': "configuration.default",
                     },
             },
-        'Drafts': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "mail.drafts",
-                    },
-            },
         'Contacts': {
                 'annotations': {
                         '/private/vendor/kolab/folder-type': "contact.default",
@@ -270,6 +265,16 @@ autocreate_folders = {
                         '/shared/vendor/kolab/folder-type': "contact",
                     },
             },
+        'Drafts': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "mail.drafts",
+                    },
+            },
+        'Files': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "file.default",
+                    },
+            },
         'Journal': {
                 'annotations': {
                         '/private/vendor/kolab/folder-type': "journal.default",





More information about the commits mailing list