Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
This commit is contained in:
Brennan Kinney 2024-01-26 01:06:11 +13:00 committed by GitHub
parent 3a2e32aeb8
commit ccbadc35f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/scripts/helpers/utils.sh
View File

@ -26,11 +26,13 @@ function _get_valid_lines_from_file() {
# This is to sanitize configs from users that unknowingly introduced CRLF: # This is to sanitize configs from users that unknowingly introduced CRLF:
function _convert_crlf_to_lf_if_necessary() { function _convert_crlf_to_lf_if_necessary() {
if [[ $(file "${1}") =~ 'CRLF' ]]; then if [[ $(file "${1}") =~ 'CRLF' ]]; then
_log 'warn' "${1} contains CRLF line-endings." _log 'warn' "File '${1}' contains CRLF line-endings"
if [[ -w "${1}" ]]; then if [[ -w ${1} ]]; then
_log 'debug' 'Converting CRLF to LF' _log 'debug' 'Converting CRLF to LF'
sed -i 's|\r||g' "${1}" sed -i 's|\r||g' "${1}"
else
_log 'warn' "File '${1}' is not writable - cannot change CRLF to LF"
fi fi
fi fi
} }
@ -43,12 +45,12 @@ function _append_final_newline_if_missing() {
# https://unix.stackexchange.com/questions/159557/how-to-non-invasively-test-for-write-access-to-a-file # https://unix.stackexchange.com/questions/159557/how-to-non-invasively-test-for-write-access-to-a-file
if [[ $(tail -c1 "${1}" | wc -l) -eq 0 ]]; then if [[ $(tail -c1 "${1}" | wc -l) -eq 0 ]]; then
# Avoid fixing when the destination is read-only: # Avoid fixing when the destination is read-only:
if [[ -w "${1}" ]]; then if [[ -w ${1} ]]; then
printf '\n' >> "${1}" printf '\n' >> "${1}"
_log 'warn' "${1} was missing a final newline. This has been fixed." _log 'info' "File '${1}' was missing a final newline - this has been fixed"
else else
_log 'warn' "${1} is missing a final newline. The last line will not be processed!" _log 'warn' "File '${1}' is missing a final newline - it is not writable, hence it was not fixed - the last line will not be processed!"
fi fi
fi fi
} }

4
target/scripts/startup/setup.d/postfix.sh
View File

@ -127,9 +127,7 @@ function __postfix__setup_override_configuration() {
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
if [[ ${LINE} =~ ^[0-9a-z] ]]; then [[ ${LINE} =~ ^[0-9a-z] ]] && postconf -P "${LINE}"
postconf -P "${LINE}"
fi
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