From 32c68874c5f3b82aa968f27c05e4f0462de73d57 Mon Sep 17 00:00:00 2001 From: alento-group <42585319+alento-group@users.noreply.github.com> Date: Sun, 30 Oct 2022 13:16:03 +0100 Subject: [PATCH 1/3] Fix NSD not restarting (#2182) A previous commit (0a970f4bb2dba052ce1c321dd8b4e9f016a56550) broke nsd restarting. This fixes that change by reverting it. Josh added: Use nsd-control with reconfig and reload if they succeed and only fall back to restarting nsd if they fail Co-authored-by: Joshua Tauberer --- management/dns_update.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/management/dns_update.py b/management/dns_update.py index 1567371a..2bfc104f 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -98,7 +98,16 @@ def do_dns_update(env, force=False): # Tell nsd to reload changed zone files. if len(updated_domains) > 0: - shell('check_call', ["/usr/sbin/nsd-control", "reload"]) + # 'reconfig' is needed if there are added or removed zones, but + # it may not reload existing zones, so we call 'reload' too. If + # nsd isn't running, nsd-control fails, so in that case revert + # to restarting nsd to make sure it is running. Restarting nsd + # should also refresh everything. + try: + shell('check_call', ["/usr/sbin/nsd-control", "reconfig"]) + shell('check_call', ["/usr/sbin/nsd-control", "reload"]) + except: + shell('check_call', ["/usr/sbin/service", "nsd", "restart"]) # Write the OpenDKIM configuration tables for all of the mail domains. from mailconfig import get_mail_domains From 1f60236985332b89b1add380ab95509ea2f19dc4 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Thu, 27 Oct 2022 10:46:09 -0400 Subject: [PATCH 2/3] Upgrade Nextcloud to 23.0.4 (contacts to 4.2.0, calendar to 3.5.0) This fixes the monthly view calendar items being in random order. --- CHANGELOG.md | 7 ++++++- setup/nextcloud.sh | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f454bbd..b51c1364 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +In Development +-------------- + +* Nextcloud is updated to 23.0.10 (contacts to 4.2.2, calendar to 3.5.1). + Version 60 (October 11, 2022) ----------------------------- @@ -17,7 +22,7 @@ No major features of Mail-in-a-Box have changed in this release, although some m With the newer version of Ubuntu the following software packages we use are updated: * dovecot is upgraded to 2.3.16, postfix to 3.6.4, opendmark to 1.4 (which adds ARC-Authentication-Results headers), and spampd to 2.53 (alleviating a mail delivery rate limiting bug). -* Nextcloud is upgraded to 23.0.4. +* Nextcloud is upgraded to 23.0.4 (contacts to 4.2.0, calendar to 3.5.0). * Roundcube is upgraded to 1.6.0. * certbot is upgraded to 1.21 (via the Ubuntu repository instead of a PPA). * fail2ban is upgraded to 0.11.2. diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 5c42c655..13afc6b7 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -21,22 +21,22 @@ echo "Installing Nextcloud (contacts/calendar)..." # we automatically install intermediate versions as needed. # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. -nextcloud_ver=23.0.8 -nextcloud_hash=9d63416a0697eeecf243d09461f5881f8997f50a +nextcloud_ver=23.0.10 +nextcloud_hash=8831c7862e39460fbb789bacac8729fab0ba02dd # Nextcloud apps # -------------- # * Find the most recent tag that is compatible with the Nextcloud version above by # consulting the ... node at: -# https://github.com/nextcloud-releases/contacts/blob/master/appinfo/info.xml -# https://github.com/nextcloud-releases/calendar/blob/master/appinfo/info.xml +# https://github.com/nextcloud-releases/contacts/blob/main/appinfo/info.xml +# https://github.com/nextcloud-releases/calendar/blob/main/appinfo/info.xml # https://github.com/nextcloud/user_external/blob/master/appinfo/info.xml # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. -contacts_ver=4.2.0 -contacts_hash=79b506574834db5e1b6ab47aadd4041e12ad9a9c -calendar_ver=3.5.0 -calendar_hash=941381536287a015081669513f8f79f6f262508a +contacts_ver=4.2.2 +contacts_hash=ca13d608ed8955aa374cb4f31b6026b57ef88887 +calendar_ver=3.5.1 +calendar_hash=c8136a3deb872a3ef73ce1155b58f3ab27ec7110 user_external_ver=3.0.0 user_external_hash=0df781b261f55bbde73d8c92da3f99397000972f From 3314c4f7de75bdf4ef7141e1042a5c3ae5cad56e Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Thu, 27 Oct 2022 10:48:45 -0400 Subject: [PATCH 3/3] v60.1 --- CHANGELOG.md | 5 +++-- README.md | 2 +- setup/bootstrap.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b51c1364..c4033df1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ CHANGELOG ========= -In Development --------------- +Version 60.1 (October 30, 2022) +------------------------------- +* A setup issue where the DNS server nsd isn't running at the end of setup is (hopefully) fixed. * Nextcloud is updated to 23.0.10 (contacts to 4.2.2, calendar to 3.5.1). Version 60 (October 11, 2022) diff --git a/README.md b/README.md index ab9a8039..42792025 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Clone this repository and checkout the tag corresponding to the most recent rele $ git clone https://github.com/mail-in-a-box/mailinabox $ cd mailinabox - $ git checkout v60 + $ git checkout v60.1 Begin the installation. diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index b700ee52..1c6d475a 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -23,7 +23,7 @@ if [ -z "$TAG" ]; then if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then # This machine is running Ubuntu 22.04, which is supported by # Mail-in-a-Box versions 60 and later. - TAG=v60 + TAG=v60.1 elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then # This machine is running Ubuntu 18.04, which is supported by # Mail-in-a-Box versions 0.40 through 5x.