From 0362fa682e2c47b0250b625c873ad44a54547f21 Mon Sep 17 00:00:00 2001 From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> Date: Tue, 18 Mar 2025 00:08:14 +0100 Subject: [PATCH 1/4] fix: include all files in change detection of Rspamd (#4418) --- CHANGELOG.md | 1 + target/scripts/helpers/change-detection.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b041d7f..b28ce558 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file. The format - **Internal:** - Minor improvements to `_install_utils()` in `packages.sh` ([#4376](https://github.com/docker-mailserver/docker-mailserver/pull/4376)) + - Change detection support for Rspamd now monitors all files at the rspamd Config Volume directory ([#4418](https://github.com/docker-mailserver/docker-mailserver/pull/4418)) ## [v15.0.0](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v15.0.0) diff --git a/target/scripts/helpers/change-detection.sh b/target/scripts/helpers/change-detection.sh index 08f6906c..a37df9ea 100644 --- a/target/scripts/helpers/change-detection.sh +++ b/target/scripts/helpers/change-detection.sh @@ -43,7 +43,7 @@ function _monitored_files_checksums() { # Check whether Rspamd is used and if so, monitor it's changes as well if [[ ${ENABLE_RSPAMD} -eq 1 ]] && [[ -d ${RSPAMD_DMS_D} ]]; then - readarray -d '' STAGING_FILES_RSPAMD < <(find "${RSPAMD_DMS_D}" -type f -name "*.sh" -print0) + readarray -d '' STAGING_FILES_RSPAMD < <(find "${RSPAMD_DMS_D}" -type f -print0) STAGING_FILES+=("${STAGING_FILES_RSPAMD[@]}") fi fi From 8ca2bd212cc9e582b7d28e21663c547dddc3f9b0 Mon Sep 17 00:00:00 2001 From: tranquillity-codes <120999089+tranquillity-codes@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:08:56 +0100 Subject: [PATCH 2/4] chore: Gender-neutral language (#4421) Co-authored-by: itycodes --- CHANGELOG.md | 2 ++ docs/content/config/environment.md | 2 +- mailserver.env | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b28ce558..9112877b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ All notable changes to this project will be documented in this file. The format ### Fixes +- **Docs** + - Gender-neutral language - **Postfix:** - `setup email restrict` generated configs now only prepend to `dms_smtpd_sender_restrictions` ([#4379](https://github.com/docker-mailserver/docker-mailserver/pull/4379)) - **Internal:** diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md index a16f6bcb..e209a0cf 100644 --- a/docs/content/config/environment.md +++ b/docs/content/config/environment.md @@ -202,7 +202,7 @@ Please read [the SSL page in the documentation][docs-tls] for more information. Configures the handling of creating mails with forged sender addresses. - **0** => (not recommended) Mail address spoofing allowed. Any logged in user may create email messages with a [forged sender address](https://en.wikipedia.org/wiki/Email_spoofing). -- 1 => Mail spoofing denied. Each user may only send with his own or his alias addresses. Addresses with [extension delimiters](http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages. +- 1 => Mail spoofing denied. Each user may only send with their own or their alias addresses. Addresses with [extension delimiters](http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages. ##### ENABLE_SRS diff --git a/mailserver.env b/mailserver.env index 8cb1cae2..338bf680 100644 --- a/mailserver.env +++ b/mailserver.env @@ -89,7 +89,7 @@ TLS_LEVEL= # Configures the handling of creating mails with forged sender addresses. # # **0** => (not recommended) Mail address spoofing allowed. Any logged in user may create email messages with a forged sender address (see also https://en.wikipedia.org/wiki/Email_spoofing). -# 1 => Mail spoofing denied. Each user may only send with his own or his alias addresses. Addresses with extension delimiters(http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages. +# 1 => Mail spoofing denied. Each user may only send with their own or their alias addresses. Addresses with extension delimiters(http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages. SPOOF_PROTECTION= # Enables the Sender Rewriting Scheme. SRS is needed if your mail server acts as forwarder. See [postsrsd](https://github.com/roehling/postsrsd/blob/master/README.md#sender-rewriting-scheme-crash-course) for further explanation. From a3571a88c135f7f6a627d82d312fbae6b1c7b817 Mon Sep 17 00:00:00 2001 From: Brennan Kinney <5098581+polarathene@users.noreply.github.com> Date: Wed, 19 Mar 2025 11:48:12 +1300 Subject: [PATCH 3/4] fix: DMS state volume must ensure `o+x` permission (#4420) --- CHANGELOG.md | 5 ++++- target/scripts/startup/setup.d/mail_state.sh | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9112877b..d5929c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,14 +17,17 @@ All notable changes to this project will be documented in this file. The format - Gender-neutral language - **Postfix:** - `setup email restrict` generated configs now only prepend to `dms_smtpd_sender_restrictions` ([#4379](https://github.com/docker-mailserver/docker-mailserver/pull/4379)) +- **Rspamd:** + - Change detection support now monitors all files found within the DMS _Config Volume_ Rspamd directory ([#4418](https://github.com/docker-mailserver/docker-mailserver/pull/4418)) - **Internal:** - A permissions fix for `/var/log/mail` that was [added in DMS v15]((https://github.com/docker-mailserver/docker-mailserver/pull/4374)) no longer encounters an error when no log files are present during a container restart, such as with a `tmpfs` volume mount ([#4391](https://github.com/docker-mailserver/docker-mailserver/pull/4391)) + - The DMS _State Volume_ (`/var/mail-state`) will now ensure it's file tree is accessible for services when the volume was created with missing executable bit ([#4420](https://github.com/docker-mailserver/docker-mailserver/pull/4420)) + - The DMS _Config Volume_ (`/tmp/docker-mailserver`) now correctly updates permissions on container restarts ([#4417](https://github.com/docker-mailserver/docker-mailserver/pull/4417)) ### Updates - **Internal:** - Minor improvements to `_install_utils()` in `packages.sh` ([#4376](https://github.com/docker-mailserver/docker-mailserver/pull/4376)) - - Change detection support for Rspamd now monitors all files at the rspamd Config Volume directory ([#4418](https://github.com/docker-mailserver/docker-mailserver/pull/4418)) ## [v15.0.0](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v15.0.0) diff --git a/target/scripts/startup/setup.d/mail_state.sh b/target/scripts/startup/setup.d/mail_state.sh index 34623859..7bcd8be3 100644 --- a/target/scripts/startup/setup.d/mail_state.sh +++ b/target/scripts/startup/setup.d/mail_state.sh @@ -95,6 +95,11 @@ function _setup_save_states() { function _setup_adjust_state_permissions() { [[ ! -d ${DMS_STATE_DIR} ]] && return 0 + # Parent directories must have executable bit set to descend the file tree for access, + # as each service running as a non-root user requires this to access their state directory, + # `/var/mail-state` must allow all users `+x`: + chmod +x "${DMS_STATE_DIR}" + # This ensures the user and group of the files from the external mount have their # numeric ID values in sync. New releases where the installed packages order changes # can change the values in the Docker image, causing an ownership mismatch. From 70d645d863fe51537398f067ec94ca8f6b27d706 Mon Sep 17 00:00:00 2001 From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> Date: Sun, 23 Mar 2025 01:27:47 +0100 Subject: [PATCH 4/4] release: v15.0.1 (#4423) Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5929c5c..28ae00d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/docker-mailserver/docker-mailserver/compare/v15.0.0...HEAD) +## [Unreleased](https://github.com/docker-mailserver/docker-mailserver/compare/v15.0.1...HEAD) > **Note**: Changes and additions listed here are contained in the `:edge` image tag. These changes may not be as stable as released changes. +## [v15.0.1](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v15.0.1) + ### Added - **Internal:**