summaryrefslogtreecommitdiffstats
path: root/share/templates
diff options
context:
space:
mode:
Diffstat (limited to 'share/templates')
-rw-r--r--share/templates/imapd.conf.tpl8
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl12
-rw-r--r--share/templates/roundcubemail/kolab_files.inc.php.tpl2
-rw-r--r--share/templates/roundcubemail/managesieve.inc.php.tpl5
4 files changed, 15 insertions, 12 deletions
diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index 874e55a..194135e 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -6,9 +6,8 @@ sendmail: /usr/sbin/sendmail
sasl_pwcheck_method: auxprop saslauthd
sasl_mech_list: PLAIN LOGIN
allowplaintext: no
-tls_cert_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_key_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
# uncomment this if you're operating in a DSCP environment (RFC-4594)
# qosmarking: af13
auth_mech: pts
@@ -32,7 +31,7 @@ ldap_time_limit: 10
unixhierarchysep: 1
virtdomains: userid
annotation_definitions: /etc/imapd.annotations.conf
-sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy
+sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
allowallsubscribe: 0
allowusermoves: 1
altnamespace: 1
@@ -47,5 +46,4 @@ username_tolower: 1
deletedprefix: DELETED
delete_mode: delayed
expunge_mode: delayed
-flushseenstate: 1
postuser: shared
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index bf61c2f..77cadab 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -6,6 +6,9 @@
\$config['session_domain'] = '';
\$config['des_key'] = "$des_key";
\$config['username_domain'] = '$primary_domain';
+ \$config['use_secure_urls'] = true;
+ \$config['assets_path'] = '/roundcubemail/assets/';
+ \$config['assets_dir'] = '/usr/share/roundcubemail/public_html/assets/';
\$config['mail_domain'] = '';
@@ -35,7 +38,6 @@
// Kolab specific defaults
\$config['product_name'] = 'Kolab Groupware';
- \$config['skin_logo'] = 'skins/kolab/images/kolab_logo.png';
\$config['quota_zero_as_unlimited'] = false;
\$config['login_lc'] = 2;
\$config['auto_create_user'] = true;
@@ -57,6 +59,7 @@
'kolab_files',
'kolab_folders',
'kolab_notes',
+ 'kolab_tags',
'libkolab',
'libcalendaring',
'managesieve',
@@ -81,8 +84,7 @@
\$config['session_lifetime'] = 180;
\$config['password_charset'] = 'UTF-8';
- \$config['useragent'] = 'Kolab 3.1/Roundcube ' . RCUBE_VERSION;
- \$config['dont_override'] = Array('skin');
+ \$config['useragent'] = 'Kolab 3.4/Roundcube ' . RCUBE_VERSION;
\$config['message_sort_col'] = 'date';
@@ -111,7 +113,7 @@
// Re-apply mandatory settings here.
- \$config['debug_level'] = 0;
+ \$config['debug_level'] = 1;
\$config['devel_mode'] = false;
\$config['log_driver'] = 'file';
\$config['log_date_format'] = 'd-M-Y H:i:s,u O';
@@ -126,7 +128,7 @@
\$config['ldap_debug'] = false;
\$config['smtp_debug'] = false;
- \$config['skin'] = 'larry';
+ \$config['skin'] = '$skin';
\$config['skin_include_php'] = false;
\$config['mime_magic'] = null;
\$config['im_identify_path'] = '/usr/bin/identify';
diff --git a/share/templates/roundcubemail/kolab_files.inc.php.tpl b/share/templates/roundcubemail/kolab_files.inc.php.tpl
index 1c5fced..bcdaccc 100644
--- a/share/templates/roundcubemail/kolab_files.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_files.inc.php.tpl
@@ -1,7 +1,7 @@
<?php
// URL of kolab-chwala installation
-\$config['kolab_files_url'] = 'http://' . \$_SERVER['HTTP_HOST'] . '/chwala/';
+\$config['kolab_files_url'] = '/chwala/';
// List of files list columns. Available are: name, size, mtime, type
\$config['kolab_files_list_cols'] = array('name', 'mtime', 'size');
diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index 0e44079..780125e 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -9,9 +9,12 @@
\$config['managesieve_mbox_encoding'] = 'UTF-8';
\$config['managesieve_replace_delimiter'] = '';
\$config['managesieve_disabled_extensions'] = array();
- \$config['managesieve_debug'] = true;
+ \$config['managesieve_debug'] = false;
\$config['managesieve_vacation'] = 1;
+ \$config['managesieve_filename_extension'] = '';
+ \$config['managesieve_kolab_master'] = true;
+
if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
}