From 432b470d2931a15a3761a3e35f1c30cac4e83b49 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 6 Jan 2025 04:06:01 -0800 Subject: [PATCH 1/2] New & improved Disable MOTD advertisements (#2470) Checks if /etc/default/motd-news exists before running commands. --- setup/system.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/system.sh b/setup/system.sh index dd366401..fce3091f 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -87,8 +87,10 @@ tools/editconf.py /etc/systemd/journald.conf MaxRetentionSec=10day # Disable MOTD adverts to prevent revealing server information in MOTD request headers # See https://ma.ttias.be/what-exactly-being-sent-ubuntu-motd/ +if [ -f /etc/default/motd-news ]; then tools/editconf.py /etc/default/motd-news ENABLED=0 rm -f /var/cache/motd-news +fi # ### Add PPAs. From e6c354c3125bdfdf32fecabb851288a385705e72 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Mon, 6 Jan 2025 07:07:53 -0500 Subject: [PATCH 2/2] v71a --- CHANGELOG.md | 2 ++ setup/bootstrap.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d76e05..45943e95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ CHANGELOG Version 71 (January 4, 2025) ---------------------------- +(Version 71a was posted on January 6, 2025 and fixes a setup regression.) + Upgrades * Roundcube upgraded to version 1.6.9. diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index 00b64c13..fc191c21 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=v71 + TAG=v71a 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.