mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
b9dbec3276
* refactored scripts located under `target/bin/` The scripts under `target/bin/` now use the new log and I replaced some `""` with `''` on the way. The functionality stays the same, this mostly style and log. * corrected fail2ban (script and tests) * corrected OpenDKIM log output in tests * reverted (some) changes to `sedfile` Moreover, a few messages for BATS were streamlined and a regression in the linting script reverted. * apple PR feedback * improve log output from `fail2ban` script The new output has a single, clear message with the '[ ERROR ] ' prefix, and then output that explains the error afterwards. This is coherent with the logging style which should be used while providing more information than just a single line about IPTables not functioning. * simplified `setquota` script * consistently named the `__usage` function Before, scripts located under `target/bin/` were using `usage` or `__usage`. Now, they're using `__usage` as they should. * improved `sedfile` With `sedfile`, we cannot use the helper functions in a nice way because it is used early in the Dockerfile at a stage where the helper scripts are not yet copied. The script has been adjusted to be canonical with all the other scripts under `target/bin/`. * fixed tests * removed `__usage` from places where it does not belong `__usage` is to be used on wrong user input, not on other failures as well. This was fixed in `delquota` and `setquota`. * apply PR review feedback
49 lines
1.2 KiB
Bash
Executable file
49 lines
1.2 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Wrapper for 'sed -i': fail if file was not modified by sed and container was not restarted.
|
|
# Error output is surpressed, when container is restarted to avoid harmless error messages.
|
|
# Use "--strict" as first parameter, to fail regardless of the container state (fresh or restarted).
|
|
|
|
# When to use sedfile?
|
|
# Is a file change optional? --> use regular 'sed -i'
|
|
# Is a file change expected? --> use 'sedfile --strict -i'
|
|
# Is a file change only on the first container run expected? --> use 'sedfile -i'
|
|
|
|
set -ueo pipefail
|
|
|
|
function __usage { echo "Usage: ${0} -i <replace/delete operation> <file>" ; }
|
|
|
|
HASHTOOL='sha1sum'
|
|
SKIP_ERROR=0
|
|
|
|
if [[ ${#} -lt 3 ]]
|
|
then
|
|
echo 'Error: At least three parameters must be given'
|
|
__usage
|
|
echo
|
|
exit 1
|
|
fi >&2
|
|
|
|
[[ -f /CONTAINER_START ]] && SKIP_ERROR=1 # hide error if container was restarted
|
|
if [[ ${1} == '--strict' ]] # show error every time
|
|
then
|
|
SKIP_ERROR=0
|
|
shift
|
|
fi
|
|
|
|
# get last argument
|
|
FILE=${*: -1}
|
|
|
|
OLD=$(${HASHTOOL} "${FILE}")
|
|
sed "${@}"
|
|
NEW=$(${HASHTOOL} "${FILE}")
|
|
|
|
# fail if file was not modified
|
|
if [[ ${OLD} == "${NEW}" ]] && [[ ${SKIP_ERROR} -eq 0 ]]
|
|
then
|
|
echo "Error: No difference after call to 'sed' in 'sedfile' (sed ${*})" >&2
|
|
exit 1
|
|
fi
|
|
|
|
exit 0
|