From c19f8c9ee64e9b5e33d7817c64180ae806ce3561 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 10 May 2020 19:29:01 -0400
Subject: [PATCH 1/5] Change Mozilla autoconfig useGlobalPreferredServer
property to false
Fixes #1736.
---
conf/mozilla-autoconfig.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/mozilla-autoconfig.xml b/conf/mozilla-autoconfig.xml
index 03e2fef3..22834622 100644
--- a/conf/mozilla-autoconfig.xml
+++ b/conf/mozilla-autoconfig.xml
@@ -21,7 +21,7 @@
<username>%EMAILADDRESS%</username>
<authentication>password-cleartext</authentication>
<addThisServer>true</addThisServer>
- <useGlobalPreferredServer>true</useGlobalPreferredServer>
+ <useGlobalPreferredServer>false</useGlobalPreferredServer>
</outgoingServer>
<documentation url="https://PRIMARY_HOSTNAME/">
From 1353949e4282ea6b7636a0ee7255bbac9fd8e246 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 10 May 2020 19:44:12 -0400
Subject: [PATCH 2/5] Upgrade Roundcube to 1.4.4, Nextcloud to 17.0.6, Z-Push
to 2.5.2
---
CHANGELOG.md | 9 +++++++++
setup/nextcloud.sh | 8 ++++----
setup/webmail.sh | 4 ++--
setup/zpush.sh | 4 ++--
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4247085..579793af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
CHANGELOG
=========
+In Development
+--------------
+
+Software updates:
+
+* Upgraded Roundcube from 1.4.2 to 1.4.4.
+* Upgraded Nextcloud from 17.0.2 to 17.0.6 (with Contacts from 3.1.6 to 3.3.0 and Calendar from 1.7.1 to v2.0.3)
+* Upgraded Z-Push to 2.5.2.
+
v0.44 (February 15, 2020)
-------------------------
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 3ab21176..76c04800 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -40,11 +40,11 @@ InstallNextcloud() {
# their github repositories.
mkdir -p /usr/local/lib/owncloud/apps
- wget_verify https://github.com/nextcloud/contacts/releases/download/v3.1.6/contacts.tar.gz d331dc6db2ecf7c8e6166926a055dfa3b59722c3 /tmp/contacts.tgz
+ wget_verify https://github.com/nextcloud/contacts/releases/download/v3.3.0/contacts.tar.gz e55d0357c6785d3b1f3b5f21780cb6d41d32443a /tmp/contacts.tgz
tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/
rm /tmp/contacts.tgz
- wget_verify https://github.com/nextcloud/calendar/releases/download/v1.7.1/calendar.tar.gz bd7c846bad06da6d6ba04280f6fbf37ef846c2ad /tmp/calendar.tgz
+ wget_verify https://github.com/nextcloud/calendar/releases/download/v2.0.3/calendar.tar.gz 9d9717b29337613b72c74e9914c69b74b346c466 /tmp/calendar.tgz
tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/
rm /tmp/calendar.tgz
@@ -91,8 +91,8 @@ InstallNextcloud() {
}
# Nextcloud Version to install. Checks are done down below to step through intermediate versions.
-nextcloud_ver=17.0.2
-nextcloud_hash=8095fb46e9e0c536163708aee3d17fab8b498ad6
+nextcloud_ver=17.0.6
+nextcloud_hash=50b98d2c2f18510b9530e558ced9ab51eb4f11b0
# Current Nextcloud Version, #1623
# Checking /usr/local/lib/owncloud/version.php shows version of the Nextcloud application, not the DB
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 89ed1722..20d43c57 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -28,8 +28,8 @@ apt_install \
# Install Roundcube from source if it is not already present or if it is out of date.
# Combine the Roundcube version number with the commit hash of plugins to track
# whether we have the latest version of everything.
-VERSION=1.4.2
-HASH=d53fcd7f1109a63364d5d4a43f879c6f47d34a89
+VERSION=1.4.4
+HASH=4e425263f5bec27d39c07bde524f421bda205c07
PERSISTENT_LOGIN_VERSION=6b3fc450cae23ccb2f393d0ef67aa319e877e435
HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5
CARDDAV_VERSION=3.0.3
diff --git a/setup/zpush.sh b/setup/zpush.sh
index a1253d2d..0cedf967 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -22,8 +22,8 @@ apt_install \
phpenmod -v php imap
# Copy Z-Push into place.
-VERSION=2.5.1
-TARGETHASH=4fa55863a429b0033497ae477aca4c8699b8f332
+VERSION=2.5.2
+TARGETHASH=2dc3dbd791b96b0ba2638df0d3d1e03c7e1cbab2
needs_update=0 #NODOC
if [ ! -f /usr/local/lib/z-push/version ]; then
needs_update=1 #NODOC
From c202a5cbc63a8972fa66595dc0944e3f657ac791 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 10 May 2020 19:46:25 -0400
Subject: [PATCH 3/5] Changlog entries
---
CHANGELOG.md | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 579793af..c723f3b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,19 @@ Software updates:
* Upgraded Nextcloud from 17.0.2 to 17.0.6 (with Contacts from 3.1.6 to 3.3.0 and Calendar from 1.7.1 to v2.0.3)
* Upgraded Z-Push to 2.5.2.
+System:
+
+* Fix for mail log statistics report on leap days.
+* Fix Mozilla autoconfig useGlobalPreferredServer setting.
+
+Web:
+
+* Add a new hidden feature to set nginx alias in www/custom.yaml.
+
+Setup:
+
+* Improved error handling.
+
v0.44 (February 15, 2020)
-------------------------
From 8fe33da85d3e15d379bbf61e91f5f934d6263f24 Mon Sep 17 00:00:00 2001
From: clonejo <clonejo@shakik.de>
Date: Sun, 3 May 2020 16:34:42 +0200
Subject: [PATCH 4/5] Run nightly tasks on a random minute after 03:00 to avoid
overload (#1754)
- The MIAB version check regularly fails at 03:00, presumably because a
large portion of installations is checking mailinabox.email at the same
time.
- At installation time, the time of the nightly clock is configured to
run at a random minute after 03:00, but before 04:00.
- Users might expect the nightly tasks to be over at a certain time and
run their own custom tasks afterwards. This could thus interfere with
custom backup routines.
- This breaks reproducibility of the installation process.
- Users might also be surprised by the nightly task time changing after
updating MIAB.
---
CHANGELOG.md | 1 +
setup/management.sh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c723f3b5..2f28474c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Software updates:
System:
+* Nightly backups now occur on a random minute in the 3am hour (in the system time zone). The minute is chosen during Mail-in-a-Box installation/upgrade and remains the same until the next upgrade.
* Fix for mail log statistics report on leap days.
* Fix Mozilla autoconfig useGlobalPreferredServer setting.
diff --git a/setup/management.sh b/setup/management.sh
index 3caf8eea..9d7c762c 100755
--- a/setup/management.sh
+++ b/setup/management.sh
@@ -101,10 +101,11 @@ hide_output systemctl enable mailinabox.service
# Perform nightly tasks at 3am in system time: take a backup, run
# status checks and email the administrator any changes.
+minute=$((RANDOM % 60)) # avoid overloading mailinabox.email
cat > /etc/cron.d/mailinabox-nightly << EOF;
# Mail-in-a-Box --- Do not edit / will be overwritten on update.
# Run nightly tasks: backup, status checks.
-0 3 * * * root (cd `pwd` && management/daily_tasks.sh)
+$minute 3 * * * root (cd `pwd` && management/daily_tasks.sh)
EOF
# Start the management server.
From c87b62b8c2d4356bd7ee508237575e115df1d0a1 Mon Sep 17 00:00:00 2001
From: yeuna92 <64936210+yeuna92@users.noreply.github.com>
Date: Mon, 11 May 2020 08:59:42 -0400
Subject: [PATCH 5/5] Fix path to Roundcube error log in fail2ban jails.conf
(#1761)
---
conf/fail2ban/jails.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/fail2ban/jails.conf b/conf/fail2ban/jails.conf
index 952dc35a..5de4fd48 100644
--- a/conf/fail2ban/jails.conf
+++ b/conf/fail2ban/jails.conf
@@ -50,7 +50,7 @@ findtime = 30
enabled = true
port = http,https
filter = miab-roundcube
-logpath = /var/log/roundcubemail/errors
+logpath = /var/log/roundcubemail/errors.log
maxretry = 20
findtime = 30