Code cleanup #33

Manually merged
jlecour merged 71 commits from jlecour-refactoring into master 2020-04-17 15:32:41 +02:00
Showing only changes of commit bdc6b4fa4d - Show all commits

View file

@ -45,8 +45,9 @@ if [ -n "${FIREWALL_RULES}" ] \
&& [ -r "${FIREWALL_RULES}" ] \
&& [ -f "${minifirewall_config}" ]; then
if ! grep -qE "^(\.|source) ${FIREWALL_RULES}" "${minifirewall_config}"; then
echo "Firewall file '${FIREWALL_RULES}' doesn't seem to be sourced by '${minifirewall_config}'."
exit 2
nb_warn=$((nb_warn + 1))
output="${output}WARNING - Firewall file '${FIREWALL_RULES}' doesn't seem to be sourced by '${minifirewall_config}'\n"
[ "${return}" -le 1 ] && return=1
fi
fi