mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
coherent renaming of functions
This commit is contained in:
parent
bf679a5504
commit
67e1e586c7
|
@ -82,7 +82,6 @@ Minimum:
|
|||
|
||||
Download the docker-compose.yml, the .env and the setup.sh files:
|
||||
|
||||
|
||||
``` BASH
|
||||
curl -o setup.sh https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh; chmod a+x ./setup.sh
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ do
|
|||
fi
|
||||
done
|
||||
;;
|
||||
* ) notify 'err' 'file not found for certificate in check_for_changes.sh' ;;
|
||||
* ) _notify 'warn' 'file not found for certificate in check_for_changes.sh' ;;
|
||||
esac
|
||||
done
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ export -f _extract_certs_from_acme
|
|||
declare -A DEFAULT_VARS
|
||||
DEFAULT_VARS["DMS_DEBUG"]="${DMS_DEBUG:="0"}"
|
||||
|
||||
function notify()
|
||||
function _notify()
|
||||
{
|
||||
c_red="\e[0;31m"
|
||||
c_green="\e[0;32m"
|
||||
|
@ -149,7 +149,7 @@ function notify()
|
|||
|
||||
[[ -n "${msg}" ]] && echo $options "${msg}"
|
||||
}
|
||||
export -f notify
|
||||
export -f _notify
|
||||
|
||||
|
||||
# ? Relay Host Map ----------------------------------------
|
||||
|
@ -168,7 +168,7 @@ function _populate_relayhost_map()
|
|||
|
||||
if [[ -f /tmp/docker-mailserver/postfix-relaymap.cf ]]
|
||||
then
|
||||
notify 'inf' "Adding relay mappings from postfix-relaymap.cf"
|
||||
_notify 'inf' "Adding relay mappings from postfix-relaymap.cf"
|
||||
# keep lines which are not a comment *and* have a destination.
|
||||
sed -n '/^\s*[^#[:space:]]\S*\s\+\S/p' /tmp/docker-mailserver/postfix-relaymap.cf >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
|
@ -183,7 +183,7 @@ function _populate_relayhost_map()
|
|||
# domain not already present *and* not ignored
|
||||
if ! grep -q -e "^@${domain}\b" /etc/postfix/relayhost_map && ! grep -qs -e "^\s*@${domain}\s*$" /tmp/docker-mailserver/postfix-relaymap.cf
|
||||
then
|
||||
notify 'inf' "Adding relay mapping for ${domain}"
|
||||
_notify 'inf' "Adding relay mapping for ${domain}"
|
||||
echo "@${domain} [$RELAY_HOST]:$RELAY_PORT" >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
done
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue