summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-05-29 16:42:06 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-05-29 16:42:06 +0200
commitad24c6538fc819dde8c99819e05ab546cc4023a7 (patch)
treeea1445a0a8fa18b55e4b0684232c2269a35fc0b8
parent1a3dff6fdf373a7ffa4b5b0166b3789cc05129b5 (diff)
parent38793dbd91a0679cd581b04ca0d1bbc48f4b268d (diff)
downloadpykolab-ad24c6538fc819dde8c99819e05ab546cc4023a7.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/pykolab
-rw-r--r--conf/kolab.conf15
-rw-r--r--share/templates/roundcubemail/main.inc.php.tpl6
2 files changed, 13 insertions, 8 deletions
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",
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';