summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-08-12 10:24:04 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-08-12 12:30:15 +0200
commit90f606b1f42e9583d0789d13fceba054fbccdeda (patch)
treecb8cb5ed5406f09675d3ed2eea6a51a5c3f779a6
parent8d9c897ba656cab3696f5923dc29cfb96d2a22be (diff)
downloadpykolab-90f606b1f42e9583d0789d13fceba054fbccdeda.tar.gz
Re-order connection options for IMAP and SMTP under TLS
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl31
1 files changed, 18 insertions, 13 deletions
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 72ac791..aa05536 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -18,6 +18,15 @@
\$config['imap_delimiter'] = '/';
\$config['imap_force_lsub'] = true;
+ // IMAP Connection TLS settings, adjust for Production
+ \$config['imap_conn_options'] = Array(
+ 'ssl' => Array(
+ 'verify_peer_name' => false,
+ 'verify_peer' => false,
+ 'allow_self_signed' => true
+ )
+ );
+
// Caching and storage settings
\$config['imap_cache'] = 'db';
\$config['imap_cache_ttl'] = '10d';
@@ -32,6 +41,15 @@
\$config['smtp_pass'] = '%p';
\$config['smtp_helo_host'] = \$_SERVER["HTTP_HOST"];
+ // SMTP Connection TLS settings, adjust for Production
+ \$config['smtp_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';
@@ -214,17 +232,4 @@
'ssl_verify_peer' => false,
);
- # required for php 5.6, see https://bbs.archlinux.org/viewtopic.php?id=193012 and http://php.net/manual/de/context.ssl.php
- # production environment requires real security settings!!!
- \$config['imap_conn_options']=array(
- 'ssl'=>array(
- 'verify_peer_name'=>false,
- 'verify_peer'=>false,
- 'allow_self_signed'=>true));
- \$config['smtp_conn_options']=array(
- 'ssl'=>array(
- 'verify_peer_name'=>false,
- 'verify_peer'=>false,
- 'allow_self_signed'=>true));
-
?>