mirror of
https://github.com/docker-mailserver/docker-mailserver
synced 2024-05-19 23:26:05 +02:00
Merge d7e92b6953
into 162e66276a
This commit is contained in:
commit
fd279a06c0
|
@ -96,7 +96,9 @@ The most noteworthy change of this release is the update of the container's base
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
|
|
||||||
- DMS config files that are parsed line by line are now more robust to parse by detecting and fixing line-endings ([#3819](https://github.com/docker-mailserver/docker-mailserver/pull/3819))
|
- DMS config:
|
||||||
|
- Files that are parsed line by line are now more robust to parse by detecting and fixing line-endings ([#3819](https://github.com/docker-mailserver/docker-mailserver/pull/3819))
|
||||||
|
- The override config `postfix-main.cf` now retains custom parameters intended for use with `postfix-master.cf` ([#3880](https://github.com/docker-mailserver/docker-mailserver/pull/3880))
|
||||||
- Variables related to Rspamd are declared as `readonly`, which would cause warnings in the log when being re-declared; we now guard against this issue ([#3837](https://github.com/docker-mailserver/docker-mailserver/pull/3837))
|
- Variables related to Rspamd are declared as `readonly`, which would cause warnings in the log when being re-declared; we now guard against this issue ([#3837](https://github.com/docker-mailserver/docker-mailserver/pull/3837))
|
||||||
- Relay host feature refactored ([#3845](https://github.com/docker-mailserver/docker-mailserver/pull/3845))
|
- Relay host feature refactored ([#3845](https://github.com/docker-mailserver/docker-mailserver/pull/3845))
|
||||||
- `DEFAULT_RELAY_HOST` ENV can now also use the `RELAY_USER` + `RELAY_PASSWORD` ENV for supplying credentials.
|
- `DEFAULT_RELAY_HOST` ENV can now also use the `RELAY_USER` + `RELAY_PASSWORD` ENV for supplying credentials.
|
||||||
|
|
|
@ -109,21 +109,6 @@ function _setup_postfix_late() {
|
||||||
function __postfix__setup_override_configuration() {
|
function __postfix__setup_override_configuration() {
|
||||||
__postfix__log 'debug' 'Overriding / adjusting configuration with user-supplied values'
|
__postfix__log 'debug' 'Overriding / adjusting configuration with user-supplied values'
|
||||||
|
|
||||||
local OVERRIDE_CONFIG_POSTFIX_MAIN='/tmp/docker-mailserver/postfix-main.cf'
|
|
||||||
if [[ -f ${OVERRIDE_CONFIG_POSTFIX_MAIN} ]]; then
|
|
||||||
cat "${OVERRIDE_CONFIG_POSTFIX_MAIN}" >>/etc/postfix/main.cf
|
|
||||||
_adjust_mtime_for_postfix_maincf
|
|
||||||
|
|
||||||
# do not directly output to 'main.cf' as this causes a read-write-conflict
|
|
||||||
postconf -n >/tmp/postfix-main-new.cf 2>/dev/null
|
|
||||||
|
|
||||||
mv /tmp/postfix-main-new.cf /etc/postfix/main.cf
|
|
||||||
_adjust_mtime_for_postfix_maincf
|
|
||||||
__postfix__log 'trace' "Adjusted '/etc/postfix/main.cf' according to '${OVERRIDE_CONFIG_POSTFIX_MAIN}'"
|
|
||||||
else
|
|
||||||
__postfix__log 'trace' "No extra Postfix settings loaded because optional '${OVERRIDE_CONFIG_POSTFIX_MAIN}' was not provided"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local OVERRIDE_CONFIG_POSTFIX_MASTER='/tmp/docker-mailserver/postfix-master.cf'
|
local OVERRIDE_CONFIG_POSTFIX_MASTER='/tmp/docker-mailserver/postfix-master.cf'
|
||||||
if [[ -f ${OVERRIDE_CONFIG_POSTFIX_MASTER} ]]; then
|
if [[ -f ${OVERRIDE_CONFIG_POSTFIX_MASTER} ]]; then
|
||||||
while read -r LINE; do
|
while read -r LINE; do
|
||||||
|
@ -131,7 +116,23 @@ function __postfix__setup_override_configuration() {
|
||||||
done < <(_get_valid_lines_from_file "${OVERRIDE_CONFIG_POSTFIX_MASTER}")
|
done < <(_get_valid_lines_from_file "${OVERRIDE_CONFIG_POSTFIX_MASTER}")
|
||||||
__postfix__log 'trace' "Adjusted '/etc/postfix/master.cf' according to '${OVERRIDE_CONFIG_POSTFIX_MASTER}'"
|
__postfix__log 'trace' "Adjusted '/etc/postfix/master.cf' according to '${OVERRIDE_CONFIG_POSTFIX_MASTER}'"
|
||||||
else
|
else
|
||||||
__postfix__log 'trace' "No extra Postfix settings loaded because optional '${OVERRIDE_CONFIG_POSTFIX_MASTER}' was not provided"
|
__postfix__log 'trace' "No extra Postfix master settings loaded because optional '${OVERRIDE_CONFIG_POSTFIX_MASTER}' was not provided"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# NOTE: Must come after postfix-master.cf as custom parameter support only works provided either config references it.
|
||||||
|
local OVERRIDE_CONFIG_POSTFIX_MAIN='/tmp/docker-mailserver/postfix-main.cf'
|
||||||
|
if [[ -f ${OVERRIDE_CONFIG_POSTFIX_MAIN} ]]; then
|
||||||
|
cat "${OVERRIDE_CONFIG_POSTFIX_MAIN}" >>/etc/postfix/main.cf
|
||||||
|
_adjust_mtime_for_postfix_maincf
|
||||||
|
|
||||||
|
# Do not directly output to 'main.cf' as this causes a read-write-conflict
|
||||||
|
postconf -n >/tmp/postfix-main-new.cf 2>/dev/null
|
||||||
|
|
||||||
|
mv /tmp/postfix-main-new.cf /etc/postfix/main.cf
|
||||||
|
_adjust_mtime_for_postfix_maincf
|
||||||
|
__postfix__log 'trace' "Adjusted '/etc/postfix/main.cf' according to '${OVERRIDE_CONFIG_POSTFIX_MAIN}'"
|
||||||
|
else
|
||||||
|
__postfix__log 'trace' "No extra Postfix main settings loaded because optional '${OVERRIDE_CONFIG_POSTFIX_MAIN}' was not provided"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue