external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-16 17:47:23 +01:00
Code Issues Releases Wiki Activity

Merge changes from upstream v0.54

Browse Source
This commit is contained in:
github@kiekerjan.isdronken.nl
2021-06-20 23:36:54 +02:00
parent cc234c2cab 4cb46ea465
commit ca5fb3c2e0
25 changed files with 462 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
conf/fail2ban/jails.conf
View File

@@ -41,6 +41,14 @@ logpath = STORAGE_ROOT/owncloud/nextcloud.log
maxretry = 20
findtime = 15m
[miab-postfix465]
enabled = true
port = 465
filter = miab-postfix-submission
logpath = /var/log/mail.log
maxretry = 20
findtime = 30
[miab-postfix587]
enabled = true
port = 587

2
conf/ios-profile.xml
View File

@@ -53,7 +53,7 @@
<key>OutgoingMailServerHostName</key>
<string>PRIMARY_HOSTNAME</string>
<key>OutgoingMailServerPortNumber</key>
<integer>587</integer>
<integer>465</integer>
<key>OutgoingMailServerUseSSL</key>
<true/>
<key>OutgoingPasswordSameAsIncomingPassword</key>

4
conf/mozilla-autoconfig.xml
View File

@@ -16,8 +16,8 @@
<outgoingServer type="smtp">
<hostname>PRIMARY_HOSTNAME</hostname>
<port>587</port>
<socketType>STARTTLS</socketType>
<port>465</port>
<socketType>SSL</socketType>
<username>%EMAILADDRESS%</username>
<authentication>password-cleartext</authentication>
<addThisServer>true</addThisServer>

2
conf/zpush/backend_imap.php
View File

@@ -49,7 +49,7 @@ define('IMAP_FROM_LDAP_FULLNAME', '#givenname #sn');
define('IMAP_SMTP_METHOD', 'sendmail');
global $imap_smtp_params;
$imap_smtp_params = array('host' => 'ssl://127.0.0.1', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
$imap_smtp_params = array('host' => 'ssl://127.0.0.1', 'port' => 465, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
define('MAIL_MIMEPART_CRLF', "\r\n");
define('IMAP_MEETING_USE_CALDAV', true);