summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimotheus Pokorra <tp@tbits.net>2015-08-25 09:31:43 +0200
committerTimotheus Pokorra <tp@tbits.net>2015-08-25 09:31:43 +0200
commitb526846a778dfda29d16d7fa70648cce2cda341c (patch)
tree50282f4aa5616cfd5901e76cc5185bc4af5cf74d
parent3fb4055a41860aafb7a78364c19d7f396ebc9eb6 (diff)
downloadpykolab-b526846a778dfda29d16d7fa70648cce2cda341c.tar.gz
move ManageSieve Connection TLS settings from config.inc.php.tpl to the managesieve config file
fixes T716
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl10
-rw-r--r--share/templates/roundcubemail/managesieve.inc.php.tpl9
2 files changed, 9 insertions, 10 deletions
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 9f7d0a4..aa05536 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -50,16 +50,6 @@
)
);
- // ManageSieve Settings
- // ManageSieve Connection TLS settings, adjust for Production
- \$config['managesieve_conn_options'] = Array(
- 'ssl' => Array(
- 'verify_peer_name' => false,
- 'verify_peer' => false,
- 'allow_self_signed' => true
- )
- );
-
// LDAP Settings
\$config['ldap_cache'] = 'db';
\$config['ldap_cache_ttl'] = '1h';
diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index 780125e..9c37b2a 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -15,6 +15,15 @@
\$config['managesieve_filename_extension'] = '';
\$config['managesieve_kolab_master'] = true;
+ // ManageSieve Connection TLS settings, adjust for Production
+ \$config['managesieve_conn_options'] = Array(
+ 'ssl' => Array(
+ 'verify_peer_name' => false,
+ 'verify_peer' => false,
+ 'allow_self_signed' => true
+ )
+ );
+
if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
}