1 |
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP |
2 |
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP 2015-04-01 20:05:54.000000000 -0400 |
3 |
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP 2022-08-01 23:08:33.766000000 -0400 |
4 |
@@ -33,7 +33,13 @@ |
5 |
// 'cafile' => '/etc/openssl/certs/ca.crt', |
6 |
// ), |
7 |
// ); |
8 |
-$config['imap_conn_options'] = null; |
9 |
+$config['imap_conn_options'] = array( |
10 |
+ 'ssl' => array( |
11 |
+ 'verify_peer' => true, |
12 |
+ 'allow_self_signed' => true, |
13 |
+ 'peer_name' => '{$DomainName}', |
14 |
+ ), |
15 |
+ ); |
16 |
|
17 |
// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout) |
18 |
$config['imap_timeout'] = 0; |
19 |
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP |
20 |
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2022-08-01 22:58:42.295000000 -0400 |
21 |
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2022-08-01 23:09:56.844000000 -0400 |
22 |
@@ -12,7 +12,7 @@ |
23 |
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) |
24 |
// %z - IMAP domain (IMAP hostname without the first part) |
25 |
// For example %n = mail.domain.tld, %t = domain.tld |
26 |
- {$OUT .= " \$config['smtp_server'] = 'ssl://localhost';\n";} |
27 |
+ {$OUT .= " \$config['smtp_server'] = 'tls://localhost';\n";} |
28 |
|
29 |
// SMTP port (default is 25; use 587 for STARTTLS or 465 for the |
30 |
// deprecated SSL over SMTP (aka SMTPS)) |
31 |
@@ -58,5 +58,12 @@ |
32 |
// 'cafile' => '/etc/openssl/certs/ca.crt', |
33 |
// ), |
34 |
// ); |
35 |
-$config['smtp_conn_options'] = null; |
36 |
+$config['smtp_conn_options'] = array( |
37 |
+ 'ssl' => array( |
38 |
+ 'verify_peer' => false, |
39 |
+ 'allow_self_signed' => true, |
40 |
+ 'peer_name' => '{$DomainName}', |
41 |
+ ), |
42 |
+ ); |
43 |
+ |
44 |
|
45 |
diff -Nur --no-dereference smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS |
46 |
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2015-04-01 20:05:54.000000000 -0400 |
47 |
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/95PLUGINS 2022-08-01 23:08:34.033000000 -0400 |
48 |
@@ -14,6 +14,9 @@ |
49 |
{ use esmith::ConfigDB; |
50 |
my $DB = esmith::ConfigDB->open_ro; |
51 |
my $plugins = $DB->get_prop('roundcube','PluginsList') || ""; |
52 |
+ my @plugs = split(',',$plugins); |
53 |
+ s/^(.*)$/"\1"/ for @plugs; |
54 |
+ $plugins = join(',',@plugs); |
55 |
$OUT .= "\$config['plugins'] = array($plugins);"; |
56 |
} |
57 |
|