1 |
brianr |
1.1 |
diff -urN 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 2023-10-31 11:43:00.847154529 +0000 |
3 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP 2023-10-31 11:47:06.045881463 +0000 |
4 |
|
|
@@ -14,10 +14,10 @@ |
5 |
|
|
// For example %n = mail.domain.tld, %t = domain.tld |
6 |
|
|
// WARNING: After hostname change update of mail_host column in users table is |
7 |
|
|
// required to match old user data records with the new host. |
8 |
|
|
- {$OUT .= " \$config['default_host'] = 'ssl://$DomainName';\n";} |
9 |
|
|
+ {$OUT .= " \$config['imap_host'] = 'ssl://$DomainName:$imaps{TCPPort}';\n";} |
10 |
|
|
|
11 |
|
|
// TCP port used for IMAP connections |
12 |
|
|
-{$OUT .= " \$config['default_port'] = $imaps{TCPPort};\n";} |
13 |
|
|
+//{$OUT .= " \$config['default_port'] = $imaps{TCPPort};\n";} |
14 |
|
|
|
15 |
|
|
// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use |
16 |
|
|
// best server supported one) |
17 |
|
|
diff -urN 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 |
18 |
|
|
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2023-10-31 11:43:00.848154532 +0000 |
19 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/40SMTP 2023-10-31 12:04:49.628881200 +0000 |
20 |
|
|
@@ -12,11 +12,12 @@ |
21 |
|
|
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) |
22 |
|
|
// %z - IMAP domain (IMAP hostname without the first part) |
23 |
|
|
// For example %n = mail.domain.tld, %t = domain.tld |
24 |
|
|
- {$OUT .= " \$config['smtp_server'] = 'tls://localhost';\n";} |
25 |
|
|
+ {$OUT .= " \$config['smtp_host'] = 'tls://localhost:$qpsmtpd{'TCPPort'}';\n";} |
26 |
|
|
+ |
27 |
|
|
|
28 |
|
|
// SMTP port (default is 25; use 587 for STARTTLS or 465 for the |
29 |
|
|
// deprecated SSL over SMTP (aka SMTPS)) |
30 |
|
|
- {$OUT .= "\$config['smtp_port'] = $qpsmtpd{'TCPPort'};\n";} |
31 |
|
|
+// {$OUT .= "\$config['smtp_port'] = $qpsmtpd{'TCPPort'};\n";} |
32 |
|
|
|
33 |
|
|
// SMTP username (if required) if you use %u as the username Roundcube |
34 |
|
|
// will use the current username for login |
35 |
|
|
diff -urN smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/80ADDRESSBOOKS_SETTINGS smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/80ADDRESSBOOKS_SETTINGS |
36 |
|
|
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/80ADDRESSBOOKS_SETTINGS 2015-04-02 01:05:54.000000000 +0100 |
37 |
|
|
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/80ADDRESSBOOKS_SETTINGS 2023-10-31 11:49:14.303261701 +0000 |
38 |
|
|
@@ -14,8 +14,8 @@ |
39 |
|
|
// In order to enable public ldap search, configure an array like the Verisign |
40 |
|
|
// example further below. if you would like to test, simply uncomment the example. |
41 |
|
|
// Array key must contain only safe characters, ie. a-zA-Z0-9_ |
42 |
|
|
- $config['ldap_public']['Local_LDAP'] = array('hosts' => array('localhost'), |
43 |
|
|
- 'port' => 389, |
44 |
|
|
+ $config['ldap_public']['Local_LDAP'] = array('hosts' => array('localhost:389'), |
45 |
|
|
+ |
46 |
|
|
{ |
47 |
|
|
$OUT .= " 'base_dn' \=\> " ."'". esmith::util::ldapBase($DomainName)."',"; |
48 |
|
|
} |