diff --git a/README.md b/README.md index 296a0203..ac980933 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/target/check-for-changes.sh b/target/check-for-changes.sh index 25ce3334..2edb51b6 100755 --- a/target/check-for-changes.sh +++ b/target/check-for-changes.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 diff --git a/target/helper_functions.sh b/target/helper_functions.sh index e28d235b..abc39671 100644 --- a/target/helper_functions.sh +++ b/target/helper_functions.sh @@ -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 diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index b456e43c..f4697825 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -84,8 +84,8 @@ CHKSUM_FILE=/tmp/docker-mailserver-config-chksum # Implement them in the section-group: {check,setup,fix,start} ########################################################################## function register_functions() { - notify 'taskgrp' 'Initializing setup' - notify 'task' 'Registering check,setup,fix,misc and start-daemons functions' + _notify 'taskgrp' 'Initializing setup' + _notify 'task' 'Registering check,setup,fix,misc and start-daemons functions' ################### >> check funcs @@ -282,27 +282,27 @@ declare -A HELPERS_EXEC_STATE ########################################################################## function _register_start_daemon() { DAEMONS_START+=($1) - notify 'inf' "$1() registered" + _notify 'inf' "$1() registered" } function _register_setup_function() { FUNCS_SETUP+=($1) - notify 'inf' "$1() registered" + _notify 'inf' "$1() registered" } function _register_fix_function() { FUNCS_FIX+=($1) - notify 'inf' "$1() registered" + _notify 'inf' "$1() registered" } function _register_check_function() { FUNCS_CHECK+=($1) - notify 'inf' "$1() registered" + _notify 'inf' "$1() registered" } function _register_misc_function() { FUNCS_MISC+=($1) - notify 'inf' "$1() registered" + _notify 'inf' "$1() registered" } ########################################################################## # << protected register_functions @@ -310,7 +310,7 @@ function _register_misc_function() { function defunc() { - notify 'fatal' "Please fix your configuration. Exiting..." + _notify 'fatal' "Please fix your configuration. Exiting..." exit 1 } @@ -319,10 +319,10 @@ function display_startup_daemon() { res=$? if [[ ${DEFAULT_VARS["DMS_DEBUG"]} == 1 ]]; then if [ $res = 0 ]; then - notify 'started' " [ OK ]" + _notify 'started' " [ OK ]" else echo "false" - notify 'err' " [ FAILED ]" + _notify 'err' " [ FAILED ]" fi fi return $res @@ -341,7 +341,7 @@ function display_startup_daemon() { # Description: Place functions for initial check of container sanity ########################################################################## function check() { - notify 'taskgrp' 'Checking configuration' + _notify 'taskgrp' 'Checking configuration' for _func in "${FUNCS_CHECK[@]}";do $_func [ $? != 0 ] && defunc @@ -349,18 +349,18 @@ function check() { } function _check_hostname() { - notify "task" "Check that hostname/domainname is provided or overridden (no default docker hostname/kubernetes) [$FUNCNAME]" + _notify "task" "Check that hostname/domainname is provided or overridden (no default docker hostname/kubernetes) [$FUNCNAME]" if [[ ! -z ${DEFAULT_VARS["OVERRIDE_HOSTNAME"]} ]]; then export HOSTNAME=${DEFAULT_VARS["OVERRIDE_HOSTNAME"]} export DOMAINNAME=$(echo $HOSTNAME | sed s/[^.]*.//) fi - notify 'inf' "Domain has been set to $DOMAINNAME" - notify 'inf' "Hostname has been set to $HOSTNAME" + _notify 'inf' "Domain has been set to $DOMAINNAME" + _notify 'inf' "Hostname has been set to $HOSTNAME" if ( ! echo $HOSTNAME | grep -E '^(\S+[.]\S+)$' > /dev/null ); then - notify 'err' "Setting hostname/domainname is required" + _notify 'err' "Setting hostname/domainname is required" kill `cat /var/run/supervisord.pid` && return 1 else return 0 @@ -368,7 +368,7 @@ function _check_hostname() { } function _check_environment_variables() { - notify "task" "Check that there are no conflicts with env variables [$FUNCNAME]" + _notify "task" "Check that there are no conflicts with env variables [$FUNCNAME]" return 0 } ########################################################################## @@ -382,14 +382,14 @@ function _check_environment_variables() { # Description: Place functions for functional configurations here ########################################################################## function setup() { - notify 'taskgrp' 'Configuring mail server' + _notify 'taskgrp' 'Configuring mail server' for _func in "${FUNCS_SETUP[@]}";do $_func done } function _setup_default_vars() { - notify 'task' "Setting up default variables [$FUNCNAME]" + _notify 'task' "Setting up default variables [$FUNCNAME]" # update POSTMASTER_ADDRESS - must be done done after _check_hostname() DEFAULT_VARS["POSTMASTER_ADDRESS"]="${POSTMASTER_ADDRESS:=postmaster@${DOMAINNAME}}" @@ -416,8 +416,8 @@ function _setup_default_vars() { for var in ${!DEFAULT_VARS[@]}; do echo "export $var=\"${DEFAULT_VARS[$var]}\"" >> /root/.bashrc - [ $? != 0 ] && notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && kill -15 `cat /var/run/supervisord.pid` && return 1 - notify 'inf' "Set $var=${DEFAULT_VARS[$var]}" + [ $? != 0 ] && _notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && kill -15 `cat /var/run/supervisord.pid` && return 1 + _notify 'inf' "Set $var=${DEFAULT_VARS[$var]}" done } @@ -425,7 +425,7 @@ function _setup_default_vars() { # when file system folders are mounted into the container. # Set the expected values and create missing folders/files just in case. function _setup_file_permissions() { - notify 'task' "Setting file/folder permissions" + _notify 'task' "Setting file/folder permissions" mkdir -p /var/log/supervisor @@ -442,67 +442,67 @@ function _setup_file_permissions() { } function _setup_chksum_file() { - notify 'task' "Setting up configuration checksum file" + _notify 'task' "Setting up configuration checksum file" if [ -d /tmp/docker-mailserver ]; then - notify 'inf' "Creating $CHKSUM_FILE" - monitored_files_checksums >"$CHKSUM_FILE" + _notify 'inf' "Creating $CHKSUM_FILE" + _monitored_files_checksums >"$CHKSUM_FILE" else # We could just skip the file, but perhaps config can be added later? # If so it must be processed by the check for changes script - notify 'inf' "Creating empty $CHKSUM_FILE (no config)" + _notify 'inf' "Creating empty $CHKSUM_FILE (no config)" touch $CHKSUM_FILE fi } function _setup_mailname() { - notify 'task' 'Setting up Mailname' + _notify 'task' 'Setting up Mailname' - notify 'inf' "Creating /etc/mailname" + _notify 'inf' "Creating /etc/mailname" echo $DOMAINNAME > /etc/mailname } function _setup_amavis() { - notify 'task' 'Setting up Amavis' + _notify 'task' 'Setting up Amavis' - notify 'inf' "Applying hostname to /etc/amavis/conf.d/05-node_id" + _notify 'inf' "Applying hostname to /etc/amavis/conf.d/05-node_id" sed -i 's/^#\$myhostname = "mail.example.com";/\$myhostname = "'$HOSTNAME'";/' /etc/amavis/conf.d/05-node_id } function _setup_dmarc_hostname() { - notify 'task' 'Setting up dmarc' + _notify 'task' 'Setting up dmarc' - notify 'inf' "Applying hostname to /etc/opendmarc.conf" + _notify 'inf' "Applying hostname to /etc/opendmarc.conf" sed -i -e 's/^AuthservID.*$/AuthservID '$HOSTNAME'/g' \ -e 's/^TrustedAuthservIDs.*$/TrustedAuthservIDs '$HOSTNAME'/g' /etc/opendmarc.conf } function _setup_postfix_hostname() { - notify 'task' 'Applying hostname and domainname to Postfix' + _notify 'task' 'Applying hostname and domainname to Postfix' - notify 'inf' "Applying hostname to /etc/postfix/main.cf" + _notify 'inf' "Applying hostname to /etc/postfix/main.cf" postconf -e "myhostname = $HOSTNAME" postconf -e "mydomain = $DOMAINNAME" } function _setup_dovecot_hostname() { - notify 'task' 'Applying hostname to Dovecot' + _notify 'task' 'Applying hostname to Dovecot' - notify 'inf' "Applying hostname to /etc/dovecot/conf.d/15-lda.conf" + _notify 'inf' "Applying hostname to /etc/dovecot/conf.d/15-lda.conf" sed -i 's/^#hostname =.*$/hostname = '$HOSTNAME'/g' /etc/dovecot/conf.d/15-lda.conf } function _setup_dovecot() { - notify 'task' 'Setting up Dovecot' + _notify 'task' 'Setting up Dovecot' # Moved from docker file, copy or generate default self-signed cert if [ -f /var/mail-state/lib-dovecot/dovecot.pem -a "$ONE_DIR" = 1 ]; then - notify 'inf' "Copying default dovecot cert" + _notify 'inf' "Copying default dovecot cert" cp /var/mail-state/lib-dovecot/dovecot.key /etc/dovecot/ssl/ cp /var/mail-state/lib-dovecot/dovecot.pem /etc/dovecot/ssl/ fi if [ ! -f /etc/dovecot/ssl/dovecot.pem ]; then - notify 'inf' "Generating default dovecot cert" + _notify 'inf' "Generating default dovecot cert" pushd /usr/share/dovecot ./mkcert.sh popd @@ -527,11 +527,11 @@ function _setup_dovecot() { # Set mail_location according to mailbox format case "$DOVECOT_MAILBOX_FORMAT" in sdbox|mdbox|maildir ) - notify 'inf' "Dovecot $DOVECOT_MAILBOX_FORMAT format configured" + _notify 'inf' "Dovecot $DOVECOT_MAILBOX_FORMAT format configured" sed -i -e 's/^mail_location = .*$/mail_location = '$DOVECOT_MAILBOX_FORMAT':\/var\/mail\/%d\/%n/g' /etc/dovecot/conf.d/10-mail.conf ;; * ) - notify 'inf' "Dovecot maildir format configured (default)" + _notify 'inf' "Dovecot maildir format configured (default)" sed -i -e 's/^mail_location = .*$/mail_location = maildir:\/var\/mail\/%d\/%n/g' /etc/dovecot/conf.d/10-mail.conf ;; esac @@ -539,7 +539,7 @@ function _setup_dovecot() { # Enable Managesieve service by setting the symlink # to the configuration file Dovecot will actually find if [ "$ENABLE_MANAGESIEVE" = 1 ]; then - notify 'inf' "Sieve management enabled" + _notify 'inf' "Sieve management enabled" mv /etc/dovecot/protocols.d/managesieved.protocol.disab /etc/dovecot/protocols.d/managesieved.protocol fi @@ -569,7 +569,7 @@ function _setup_dovecot() { # sieve will move spams to .Junk folder when SPAMASSASSIN_SPAM_TO_INBOX=1 and MOVE_SPAM_TO_JUNK=1 if [ "$SPAMASSASSIN_SPAM_TO_INBOX" = 1 ] && [ "$MOVE_SPAM_TO_JUNK" = 1 ]; then - notify 'inf' "Spam messages will be moved to the Junk folder." + _notify 'inf' "Spam messages will be moved to the Junk folder." cp /etc/dovecot/sieve/before/60-spam.sieve /usr/lib/dovecot/sieve-global/before/ sievec /usr/lib/dovecot/sieve-global/before/60-spam.sieve else @@ -582,7 +582,7 @@ function _setup_dovecot() { } function _setup_dovecot_quota() { - notify 'task' 'Setting up Dovecot quota' + _notify 'task' 'Setting up Dovecot quota' if [ "$ENABLE_LDAP" = 1 ] || [ "$SMTP_ONLY" = 1 ] || [ "$ENABLE_QUOTAS" = 0 ]; then # Dovecot quota is disabled when using LDAP or SMTP_ONLY or when explicitly disabled @@ -610,7 +610,7 @@ function _setup_dovecot_quota() { sed -i "s/quota_rule = \*:storage=.*/quota_rule = *:storage=${mailbox_limit_mb}$([ "$mailbox_limit_mb" == 0 ] && echo "" || echo "M")/g" /etc/dovecot/conf.d/90-quota.conf if [ ! -f /tmp/docker-mailserver/dovecot-quotas.cf ]; then - notify 'inf' "'config/docker-mailserver/dovecot-quotas.cf' is not provided. Using default quotas." + _notify 'inf' "'config/docker-mailserver/dovecot-quotas.cf' is not provided. Using default quotas." echo -n >/tmp/docker-mailserver/dovecot-quotas.cf fi @@ -620,13 +620,13 @@ function _setup_dovecot_quota() { } function _setup_dovecot_local_user() { - notify 'task' 'Setting up Dovecot Local User' + _notify 'task' 'Setting up Dovecot Local User' echo -n > /etc/postfix/vmailbox echo -n > /etc/dovecot/userdb if [ -f /tmp/docker-mailserver/postfix-accounts.cf -a "$ENABLE_LDAP" != 1 ]; then - notify 'inf' "Checking file line endings" + _notify 'inf' "Checking file line endings" sed -i 's/\r//g' /tmp/docker-mailserver/postfix-accounts.cf - notify 'inf' "Regenerating postfix user list" + _notify 'inf' "Regenerating postfix user list" echo "# WARNING: this file is auto-generated. Modify config/postfix-accounts.cf to edit user list." > /etc/postfix/vmailbox # Checking that /tmp/docker-mailserver/postfix-accounts.cf ends with a newline @@ -658,7 +658,7 @@ function _setup_dovecot_local_user() { fi # Let's go! - notify 'inf' "user '${user}' for domain '${domain}' with password '********', attr=${user_attributes}" + _notify 'inf' "user '${user}' for domain '${domain}' with password '********', attr=${user_attributes}" echo "${login} ${domain}/${user}/" >> /etc/postfix/vmailbox # User database for dovecot has the following format: @@ -673,12 +673,12 @@ function _setup_dovecot_local_user() { echo ${domain} >> /tmp/vhost.tmp done else - notify 'inf' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created." + _notify 'inf' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created." fi if [[ ! $(grep '@' /tmp/docker-mailserver/postfix-accounts.cf | grep '|') ]]; then if [ $ENABLE_LDAP -eq 0 ]; then - notify 'fatal' "Unless using LDAP, you need at least 1 email account to start Dovecot." + _notify 'fatal' "Unless using LDAP, you need at least 1 email account to start Dovecot." defunc fi fi @@ -686,9 +686,9 @@ function _setup_dovecot_local_user() { } function _setup_ldap() { - notify 'task' 'Setting up Ldap' + _notify 'task' 'Setting up Ldap' - notify 'inf' 'Checking for custom configs' + _notify 'inf' 'Checking for custom configs' # cp config files if in place for i in 'users' 'groups' 'aliases' 'domains'; do fpath="/tmp/docker-mailserver/ldap-${i}.cf" @@ -697,7 +697,7 @@ function _setup_ldap() { fi done - notify 'inf' 'Starting to override configs' + _notify 'inf' 'Starting to override configs' for f in /etc/postfix/ldap-users.cf /etc/postfix/ldap-groups.cf /etc/postfix/ldap-aliases.cf /etc/postfix/ldap-domains.cf /etc/postfix/maps/sender_login_maps.ldap do [[ $f =~ ldap-user ]] && export LDAP_QUERY_FILTER="${LDAP_QUERY_FILTER_USER}" @@ -707,7 +707,7 @@ function _setup_ldap() { configomat.sh "LDAP_" "${f}" done - notify 'inf' "Configuring dovecot LDAP" + _notify 'inf' "Configuring dovecot LDAP" declare -A _dovecot_ldap_mapping @@ -728,28 +728,28 @@ function _setup_ldap() { # Add domainname to vhost. echo $DOMAINNAME >> /tmp/vhost.tmp - notify 'inf' "Enabling dovecot LDAP authentification" + _notify 'inf' "Enabling dovecot LDAP authentification" sed -i -e '/\!include auth-ldap\.conf\.ext/s/^#//' /etc/dovecot/conf.d/10-auth.conf sed -i -e '/\!include auth-passwdfile\.inc/s/^/#/' /etc/dovecot/conf.d/10-auth.conf - notify 'inf' "Configuring LDAP" + _notify 'inf' "Configuring LDAP" [ -f /etc/postfix/ldap-users.cf ] && \ postconf -e "virtual_mailbox_maps = ldap:/etc/postfix/ldap-users.cf" || \ - notify 'inf' "==> Warning: /etc/postfix/ldap-user.cf not found" + _notify 'inf' "==> Warning: /etc/postfix/ldap-user.cf not found" [ -f /etc/postfix/ldap-domains.cf ] && \ postconf -e "virtual_mailbox_domains = /etc/postfix/vhost, ldap:/etc/postfix/ldap-domains.cf" || \ - notify 'inf' "==> Warning: /etc/postfix/ldap-domains.cf not found" + _notify 'inf' "==> Warning: /etc/postfix/ldap-domains.cf not found" [ -f /etc/postfix/ldap-aliases.cf -a -f /etc/postfix/ldap-groups.cf ] && \ postconf -e "virtual_alias_maps = ldap:/etc/postfix/ldap-aliases.cf, ldap:/etc/postfix/ldap-groups.cf" || \ - notify 'inf' "==> Warning: /etc/postfix/ldap-aliases.cf or /etc/postfix/ldap-groups.cf not found" + _notify 'inf' "==> Warning: /etc/postfix/ldap-aliases.cf or /etc/postfix/ldap-groups.cf not found" return 0 } function _setup_postgrey() { - notify 'inf' "Configuring postgrey" + _notify 'inf' "Configuring postgrey" sed -i -e 's/, reject_rbl_client bl.spamcop.net$/, reject_rbl_client bl.spamcop.net, check_policy_service inet:127.0.0.1:10023/' /etc/postfix/main.cf sed -i -e "s/\"--inet=127.0.0.1:10023\"/\"--inet=127.0.0.1:10023 --delay=$POSTGREY_DELAY --max-age=$POSTGREY_MAX_AGE --auto-whitelist-clients=$POSTGREY_AUTO_WHITELIST_CLIENTS\"/" /etc/default/postgrey TEXT_FOUND=`grep -i "POSTGREY_TEXT" /etc/default/postgrey | wc -l` @@ -766,28 +766,28 @@ function _setup_postgrey() { } function _setup_postfix_postscreen() { - notify 'inf' "Configuring postscreen" + _notify 'inf' "Configuring postscreen" sed -i -e "s/postscreen_dnsbl_action = enforce/postscreen_dnsbl_action = $POSTSCREEN_ACTION/" \ -e "s/postscreen_greet_action = enforce/postscreen_greet_action = $POSTSCREEN_ACTION/" \ -e "s/postscreen_bare_newline_action = enforce/postscreen_bare_newline_action = $POSTSCREEN_ACTION/" /etc/postfix/main.cf } function _setup_postfix_sizelimits() { - notify 'inf' "Configuring postfix message size limit" + _notify 'inf' "Configuring postfix message size limit" postconf -e "message_size_limit = ${DEFAULT_VARS["POSTFIX_MESSAGE_SIZE_LIMIT"]}" - notify 'inf' "Configuring postfix mailbox size limit" + _notify 'inf' "Configuring postfix mailbox size limit" postconf -e "mailbox_size_limit = ${DEFAULT_VARS["POSTFIX_MAILBOX_SIZE_LIMIT"]}" - notify 'inf' "Configuring postfix virtual mailbox size limit" + _notify 'inf' "Configuring postfix virtual mailbox size limit" postconf -e "virtual_mailbox_limit = ${DEFAULT_VARS["POSTFIX_MAILBOX_SIZE_LIMIT"]}" } function _setup_postfix_smtputf8() { - notify 'inf' "Configuring postfix smtputf8 support (disable)" + _notify 'inf' "Configuring postfix smtputf8 support (disable)" postconf -e "smtputf8_enable = no" } function _setup_spoof_protection () { - notify 'inf' "Configuring Spoof Protection" + _notify 'inf' "Configuring Spoof Protection" sed -i 's|smtpd_sender_restrictions =|smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,|' /etc/postfix/main.cf [ "$ENABLE_LDAP" = 1 ] \ && postconf -e "smtpd_sender_login_maps=ldap:/etc/postfix/ldap-users.cf ldap:/etc/postfix/ldap-aliases.cf ldap:/etc/postfix/ldap-groups.cf" \ @@ -795,7 +795,7 @@ function _setup_spoof_protection () { } function _setup_postfix_access_control() { - notify 'inf' "Configuring user access" + _notify 'inf' "Configuring user access" [ -f /tmp/docker-mailserver/postfix-send-access.cf ] && sed -i 's|smtpd_sender_restrictions =|smtpd_sender_restrictions = check_sender_access texthash:/tmp/docker-mailserver/postfix-send-access.cf,|' /etc/postfix/main.cf [ -f /tmp/docker-mailserver/postfix-receive-access.cf ] && sed -i 's|smtpd_recipient_restrictions =|smtpd_recipient_restrictions = check_recipient_access texthash:/tmp/docker-mailserver/postfix-receive-access.cf,|' /etc/postfix/main.cf } @@ -819,9 +819,9 @@ EOF } function _setup_saslauthd() { - notify 'task' "Setting up Saslauthd" + _notify 'task' "Setting up Saslauthd" - notify 'inf' "Configuring Cyrus SASL" + _notify 'inf' "Configuring Cyrus SASL" # checking env vars and setting defaults [ -z "$SASLAUTHD_MECHANISMS" ] && SASLAUTHD_MECHANISMS=pam [ "$SASLAUTHD_MECHANISMS" = ldap -a -z "$SASLAUTHD_LDAP_SEARCH_BASE" ] && SASLAUTHD_MECHANISMS=pam @@ -832,7 +832,7 @@ function _setup_saslauthd() { [ -z "$SASLAUTHD_LDAP_TLS_CHECK_PEER" ] && SASLAUTHD_LDAP_TLS_CHECK_PEER=no if [ ! -f /etc/saslauthd.conf ]; then - notify 'inf' "Creating /etc/saslauthd.conf" + _notify 'inf' "Creating /etc/saslauthd.conf" cat > /etc/saslauthd.conf << EOF ldap_servers: ${SASLAUTHD_LDAP_PROTO}${SASLAUTHD_LDAP_SERVER} @@ -865,7 +865,7 @@ EOF } function _setup_postfix_aliases() { - notify 'task' 'Setting up Postfix Aliases' + _notify 'task' 'Setting up Postfix Aliases' echo -n > /etc/postfix/virtual echo -n > /etc/postfix/regexp @@ -883,11 +883,11 @@ function _setup_postfix_aliases() { test "$uname" != "$domain" && echo ${domain} >> /tmp/vhost.tmp done else - notify 'inf' "Warning 'config/postfix-virtual.cf' is not provided. No mail alias/forward created." + _notify 'inf' "Warning 'config/postfix-virtual.cf' is not provided. No mail alias/forward created." fi if [ -f /tmp/docker-mailserver/postfix-regexp.cf ]; then # Copying regexp alias file - notify 'inf' "Adding regexp alias file postfix-regexp.cf" + _notify 'inf' "Adding regexp alias file postfix-regexp.cf" cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp sed -i -e '/^virtual_alias_maps/{ s/ pcre:.*// @@ -895,19 +895,19 @@ function _setup_postfix_aliases() { }' /etc/postfix/main.cf fi - notify 'inf' "Configuring root alias" + _notify 'inf' "Configuring root alias" echo "root: ${POSTMASTER_ADDRESS}" > /etc/aliases if [ -f /tmp/docker-mailserver/postfix-aliases.cf ]; then cat /tmp/docker-mailserver/postfix-aliases.cf>>/etc/aliases else - notify 'inf' "'config/postfix-aliases.cf' is not provided and will be auto created." + _notify 'inf' "'config/postfix-aliases.cf' is not provided and will be auto created." echo -n >/tmp/docker-mailserver/postfix-aliases.cf fi postalias /etc/aliases } function _setup_SRS() { - notify 'task' 'Setting up SRS' + _notify 'task' 'Setting up SRS' postconf -e "sender_canonical_maps = tcp:localhost:10001" postconf -e "sender_canonical_classes = $SRS_SENDER_CLASSES" postconf -e "recipient_canonical_maps = tcp:localhost:10002" @@ -915,20 +915,20 @@ function _setup_SRS() { } function _setup_dkim() { - notify 'task' 'Setting up DKIM' + _notify 'task' 'Setting up DKIM' mkdir -p /etc/opendkim && touch /etc/opendkim/SigningTable # Check if keys are already available if [ -e "/tmp/docker-mailserver/opendkim/KeyTable" ]; then cp -a /tmp/docker-mailserver/opendkim/* /etc/opendkim/ - notify 'inf' "DKIM keys added for: `ls -C /etc/opendkim/keys/`" - notify 'inf' "Changing permissions on /etc/opendkim" + _notify 'inf' "DKIM keys added for: `ls -C /etc/opendkim/keys/`" + _notify 'inf' "Changing permissions on /etc/opendkim" chown -R opendkim:opendkim /etc/opendkim/ # And make sure permissions are right chmod -R 0700 /etc/opendkim/keys/ else - notify 'warn' "No DKIM key provided. Check the documentation to find how to get your keys." + _notify 'warn' "No DKIM key provided. Check the documentation to find how to get your keys." local _f_keytable="/etc/opendkim/KeyTable" [ ! -f "$_f_keytable" ] && touch "$_f_keytable" @@ -937,12 +937,12 @@ function _setup_dkim() { # Setup nameservers paramater from /etc/resolv.conf if not defined if ! grep '^Nameservers' /etc/opendkim.conf; then echo "Nameservers $(grep '^nameserver' /etc/resolv.conf | awk -F " " '{print $2}' | paste -sd ',' -)" >> /etc/opendkim.conf - notify 'inf' "Nameservers added to /etc/opendkim.conf" + _notify 'inf' "Nameservers added to /etc/opendkim.conf" fi } function _setup_ssl() { - notify 'task' 'Setting up SSL' + _notify 'task' 'Setting up SSL' # TLS strength/level configuration case $TLS_LEVEL in @@ -957,7 +957,7 @@ function _setup_ssl() { sed -i -r 's/^ssl_min_protocol =.*$/ssl_min_protocol = TLSv1.2/' /etc/dovecot/conf.d/10-ssl.conf sed -i -r 's/^ssl_cipher_list =.*$/ssl_cipher_list = ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256/' /etc/dovecot/conf.d/10-ssl.conf - notify 'inf' "TLS configured with 'modern' ciphers" + _notify 'inf' "TLS configured with 'modern' ciphers" ;; "intermediate" ) # Postfix configuration @@ -970,19 +970,19 @@ function _setup_ssl() { sed -i -r 's/^ssl_min_protocol = .*$/ssl_min_protocol = TLSv1/' /etc/dovecot/conf.d/10-ssl.conf sed -i -r 's/^ssl_cipher_list = .*$/ssl_cipher_list = ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS/' /etc/dovecot/conf.d/10-ssl.conf - notify 'inf' "TLS configured with 'intermediate' ciphers" + _notify 'inf' "TLS configured with 'intermediate' ciphers" ;; esac # SSL certificate Configuration case $SSL_TYPE in "letsencrypt" ) - notify 'inf' "Configuring SSL using 'letsencrypt'" + _notify 'inf' "Configuring SSL using 'letsencrypt'" # letsencrypt folders and files mounted in /etc/letsencrypt local LETSENCRYPT_DOMAIN="" local LETSENCRYPT_KEY="" - [[ -f /etc/letsencrypt/acme.json ]] && (extractCertsFromAcmeJson "$HOSTNAME" || extractCertsFromAcmeJson "$DOMAINNAME") + [[ -f /etc/letsencrypt/acme.json ]] && (_extract_certs_from_acme "$HOSTNAME" || _extract_certs_from_acme "$DOMAINNAME") # first determine the letsencrypt domain by checking both the full hostname or just the domainname if a SAN is used in the cert if [ -e "/etc/letsencrypt/live/$HOSTNAME/fullchain.pem" ]; then @@ -990,7 +990,7 @@ function _setup_ssl() { elif [ -e "/etc/letsencrypt/live/$DOMAINNAME/fullchain.pem" ]; then LETSENCRYPT_DOMAIN=$DOMAINNAME else - notify 'err' "Cannot access '/etc/letsencrypt/live/"$HOSTNAME"/fullchain.pem' or '/etc/letsencrypt/live/"$DOMAINNAME"/fullchain.pem'" + _notify 'err' "Cannot access '/etc/letsencrypt/live/"$HOSTNAME"/fullchain.pem' or '/etc/letsencrypt/live/"$DOMAINNAME"/fullchain.pem'" return 1 fi @@ -1001,14 +1001,14 @@ function _setup_ssl() { elif [ -e "/etc/letsencrypt/live/$LETSENCRYPT_DOMAIN/key.pem" ]; then LETSENCRYPT_KEY="key" else - notify 'err' "Cannot access '/etc/letsencrypt/live/"$LETSENCRYPT_DOMAIN"/privkey.pem' nor 'key.pem'" + _notify 'err' "Cannot access '/etc/letsencrypt/live/"$LETSENCRYPT_DOMAIN"/privkey.pem' nor 'key.pem'" return 1 fi fi # finally, make the changes to the postfix and dovecot configurations if [ -n "$LETSENCRYPT_KEY" ]; then - notify 'inf' "Adding $LETSENCRYPT_DOMAIN SSL certificate to the postfix and dovecot configuration" + _notify 'inf' "Adding $LETSENCRYPT_DOMAIN SSL certificate to the postfix and dovecot configuration" # Postfix configuration sed -i -r 's~smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem~smtpd_tls_cert_file=/etc/letsencrypt/live/'$LETSENCRYPT_DOMAIN'/fullchain.pem~g' /etc/postfix/main.cf @@ -1018,14 +1018,14 @@ function _setup_ssl() { sed -i -e 's~ssl_cert = /etc/postfix/vhost && rm /tmp/vhost.tmp @@ -1118,12 +1118,12 @@ function _setup_postfix_vhost() { } function _setup_inet_protocols() { - notify 'task' 'Setting up POSTFIX_INET_PROTOCOLS option' + _notify 'task' 'Setting up POSTFIX_INET_PROTOCOLS option' postconf -e "inet_protocols = $POSTFIX_INET_PROTOCOLS" } function _setup_docker_permit() { - notify 'task' 'Setting up PERMIT_DOCKER Option' + _notify 'task' 'Setting up PERMIT_DOCKER Option' container_ip=$(ip addr show eth0 | grep 'inet ' | sed 's/[^0-9\.\/]*//g' | cut -d '/' -f 1) container_network="$(echo $container_ip | cut -d '.' -f1-2).0.0" @@ -1131,14 +1131,14 @@ function _setup_docker_permit() { case $PERMIT_DOCKER in "host" ) - notify 'inf' "Adding $container_network/16 to my networks" + _notify 'inf' "Adding $container_network/16 to my networks" postconf -e "$(postconf | grep '^mynetworks =') $container_network/16" echo $container_network/16 >> /etc/opendmarc/ignore.hosts echo $container_network/16 >> /etc/opendkim/TrustedHosts ;; "network" ) - notify 'inf' "Adding docker network in my networks" + _notify 'inf' "Adding docker network in my networks" postconf -e "$(postconf | grep '^mynetworks =') 172.16.0.0/12" echo 172.16.0.0/12 >> /etc/opendmarc/ignore.hosts echo 172.16.0.0/12 >> /etc/opendkim/TrustedHosts @@ -1146,14 +1146,14 @@ function _setup_docker_permit() { "connected-networks" ) for network in $container_networks; do network=$(_sanitize_ipv4_to_subnet_cidr $network) - notify 'inf' "Adding docker network $network in my networks" + _notify 'inf' "Adding docker network $network in my networks" postconf -e "$(postconf | grep '^mynetworks =') $network" echo $network >> /etc/opendmarc/ignore.hosts echo $network >> /etc/opendkim/TrustedHosts done ;; * ) - notify 'inf' "Adding container ip in my networks" + _notify 'inf' "Adding container ip in my networks" postconf -e "$(postconf | grep '^mynetworks =') $container_ip/32" echo $container_ip/32 >> /etc/opendmarc/ignore.hosts echo $container_ip/32 >> /etc/opendkim/TrustedHosts @@ -1162,7 +1162,7 @@ function _setup_docker_permit() { } function _setup_postfix_virtual_transport() { - notify 'task' 'Setting up Postfix virtual transport' + _notify 'task' 'Setting up Postfix virtual transport' [ -z "${POSTFIX_DAGENT}" ] && \ echo "${POSTFIX_DAGENT} not set." && \ @@ -1171,7 +1171,7 @@ function _setup_postfix_virtual_transport() { } function _setup_postfix_override_configuration() { - notify 'task' 'Setting up Postfix Override configuration' + _notify 'task' 'Setting up Postfix Override configuration' if [ -f /tmp/docker-mailserver/postfix-main.cf ]; then while read line; do @@ -1181,9 +1181,9 @@ function _setup_postfix_override_configuration() { postconf -e "$line" fi done < /tmp/docker-mailserver/postfix-main.cf - notify 'inf' "Loaded 'config/postfix-main.cf'" + _notify 'inf' "Loaded 'config/postfix-main.cf'" else - notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-main.cf' not provided." + _notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-main.cf' not provided." fi if [ -f /tmp/docker-mailserver/postfix-master.cf ]; then while read line; do @@ -1191,17 +1191,17 @@ function _setup_postfix_override_configuration() { postconf -P "$line" fi done < /tmp/docker-mailserver/postfix-master.cf - notify 'inf' "Loaded 'config/postfix-master.cf'" + _notify 'inf' "Loaded 'config/postfix-master.cf'" else - notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-master.cf' not provided." + _notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-master.cf' not provided." fi - notify 'inf' "set the compatibility level to 2" + _notify 'inf' "set the compatibility level to 2" postconf compatibility_level=2 } function _setup_postfix_sasl_password() { - notify 'task' 'Setting up Postfix SASL Password' + _notify 'task' 'Setting up Postfix SASL Password' # Support general SASL password rm -f /etc/postfix/sasl_passwd @@ -1213,25 +1213,25 @@ function _setup_postfix_sasl_password() { if [ -f /etc/postfix/sasl_passwd ]; then chown root:root /etc/postfix/sasl_passwd chmod 0600 /etc/postfix/sasl_passwd - notify 'inf' "Loaded SASL_PASSWD" + _notify 'inf' "Loaded SASL_PASSWD" else - notify 'inf' "Warning: 'SASL_PASSWD' is not provided. /etc/postfix/sasl_passwd not created." + _notify 'inf' "Warning: 'SASL_PASSWD' is not provided. /etc/postfix/sasl_passwd not created." fi } function _setup_postfix_default_relay_host() { - notify 'task' 'Applying default relay host to Postfix' + _notify 'task' 'Applying default relay host to Postfix' - notify 'inf' "Applying default relay host $DEFAULT_RELAY_HOST to /etc/postfix/main.cf" + _notify 'inf' "Applying default relay host $DEFAULT_RELAY_HOST to /etc/postfix/main.cf" postconf -e "relayhost = $DEFAULT_RELAY_HOST" } function _setup_postfix_relay_hosts() { - notify 'task' 'Setting up Postfix Relay Hosts' + _notify 'task' 'Setting up Postfix Relay Hosts' # copy old AWS_SES variables to new variables if [ -z "$RELAY_HOST" ]; then if [ ! -z "$AWS_SES_HOST" ]; then - notify 'inf' "Using deprecated AWS_SES environment variables" + _notify 'inf' "Using deprecated AWS_SES environment variables" RELAY_HOST=$AWS_SES_HOST fi fi @@ -1249,7 +1249,7 @@ function _setup_postfix_relay_hosts() { RELAY_PASSWORD=$(echo "$AWS_SES_USERPASS" | cut -f 2 -d ":") fi fi - notify 'inf' "Setting up outgoing email relaying via $RELAY_HOST:$RELAY_PORT" + _notify 'inf' "Setting up outgoing email relaying via $RELAY_HOST:$RELAY_PORT" # setup /etc/postfix/sasl_passwd # -- @@ -1260,7 +1260,7 @@ function _setup_postfix_relay_hosts() { # [smtp.mailgun.org]:587 postmaster@domain2.com:your-password-2 if [ -f /tmp/docker-mailserver/postfix-sasl-password.cf ]; then - notify 'inf' "Adding relay authentication from postfix-sasl-password.cf" + _notify 'inf' "Adding relay authentication from postfix-sasl-password.cf" while read line; do if ! echo "$line" | grep -q -e "^\s*#"; then echo "$line" >> /etc/postfix/sasl_passwd @@ -1273,7 +1273,7 @@ function _setup_postfix_relay_hosts() { echo "[$RELAY_HOST]:$RELAY_PORT $RELAY_USER:$RELAY_PASSWORD" >> /etc/postfix/sasl_passwd else if [ ! -f /tmp/docker-mailserver/postfix-sasl-password.cf ]; then - notify 'warn' "No relay auth file found and no default set" + _notify 'warn' "No relay auth file found and no default set" fi fi @@ -1283,7 +1283,7 @@ function _setup_postfix_relay_hosts() { fi # end /etc/postfix/sasl_passwd - populate_relayhost_map + _populate_relayhost_map postconf -e \ "smtp_sasl_auth_enable = yes" \ @@ -1298,16 +1298,16 @@ function _setup_postfix_relay_hosts() { } function _setup_postfix_dhparam() { - notify 'task' 'Setting up Postfix dhparam' + _notify 'task' 'Setting up Postfix dhparam' if [ "$ONE_DIR" = 1 ];then DHPARAMS_FILE=/var/mail-state/lib-shared/dhparams.pem if [ ! -f $DHPARAMS_FILE ]; then - notify 'inf' "Use ffdhe4096 for dhparams (postfix)" + _notify 'inf' "Use ffdhe4096 for dhparams (postfix)" rm -f /etc/postfix/dhparams.pem && cp /etc/postfix/shared/ffdhe4096.pem /etc/postfix/dhparams.pem else - notify 'inf' "Use postfix dhparams that was generated previously" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." + _notify 'inf' "Use postfix dhparams that was generated previously" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." # Copy from the state directory to the working location rm -f /etc/postfix/dhparams.pem && cp $DHPARAMS_FILE /etc/postfix/dhparams.pem @@ -1315,36 +1315,36 @@ function _setup_postfix_dhparam() { else if [ ! -f /etc/postfix/dhparams.pem ]; then if [ -f /etc/dovecot/dh.pem ]; then - notify 'inf' "Copy dovecot dhparams to postfix" + _notify 'inf' "Copy dovecot dhparams to postfix" cp /etc/dovecot/dh.pem /etc/postfix/dhparams.pem elif [ -f /tmp/docker-mailserver/dhparams.pem ]; then - notify 'inf' "Copy pre-generated dhparams to postfix" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." + _notify 'inf' "Copy pre-generated dhparams to postfix" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." cp /tmp/docker-mailserver/dhparams.pem /etc/postfix/dhparams.pem else - notify 'inf' "Use ffdhe4096 for dhparams (postfix)" + _notify 'inf' "Use ffdhe4096 for dhparams (postfix)" cp /etc/postfix/shared/ffdhe4096.pem /etc/postfix/dhparams.pem fi else - notify 'inf' "Use existing postfix dhparams" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /etc/postfix/dhparams.pem." + _notify 'inf' "Use existing postfix dhparams" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /etc/postfix/dhparams.pem." fi fi } function _setup_dovecot_dhparam() { - notify 'task' 'Setting up Dovecot dhparam' + _notify 'task' 'Setting up Dovecot dhparam' if [ "$ONE_DIR" = 1 ];then DHPARAMS_FILE=/var/mail-state/lib-shared/dhparams.pem if [ ! -f $DHPARAMS_FILE ]; then - notify 'inf' "Use ffdhe4096 for dhparams (dovecot)" + _notify 'inf' "Use ffdhe4096 for dhparams (dovecot)" rm -f /etc/dovecot/dh.pem && cp /etc/postfix/shared/ffdhe4096.pem /etc/dovecot/dh.pem else - notify 'inf' "Use dovecot dhparams that was generated previously" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." + _notify 'inf' "Use dovecot dhparams that was generated previously" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /var/mail-state/lib-shared/dhparams.pem." # Copy from the state directory to the working location rm -f /etc/dovecot/dh.pem && cp $DHPARAMS_FILE /etc/dovecot/dh.pem @@ -1352,27 +1352,27 @@ function _setup_dovecot_dhparam() { else if [ ! -f /etc/dovecot/dh.pem ]; then if [ -f /etc/postfix/dhparams.pem ]; then - notify 'inf' "Copy postfix dhparams to dovecot" + _notify 'inf' "Copy postfix dhparams to dovecot" cp /etc/postfix/dhparams.pem /etc/dovecot/dh.pem elif [ -f /tmp/docker-mailserver/dhparams.pem ]; then - notify 'inf' "Copy pre-generated dhparams to dovecot" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /tmp/docker-mailserver/dhparams.pem." + _notify 'inf' "Copy pre-generated dhparams to dovecot" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /tmp/docker-mailserver/dhparams.pem." cp /tmp/docker-mailserver/dhparams.pem /etc/dovecot/dh.pem else - notify 'inf' "Use ffdhe4096 for dhparams (dovecot)" + _notify 'inf' "Use ffdhe4096 for dhparams (dovecot)" cp /etc/postfix/shared/ffdhe4096.pem /etc/dovecot/dh.pem fi else - notify 'inf' "Use existing dovecot dhparams" - notify 'warn' "Using self-generated dhparams is considered as insecure." - notify 'warn' "Unless you known what you are doing, please remove /etc/dovecot/dh.pem." + _notify 'inf' "Use existing dovecot dhparams" + _notify 'warn' "Using self-generated dhparams is considered as insecure." + _notify 'warn' "Unless you known what you are doing, please remove /etc/dovecot/dh.pem." fi fi } function _setup_security_stack() { - notify 'task' "Setting up Security Stack" + _notify 'task' "Setting up Security Stack" # recreate auto-generated file dms_amavis_file="/etc/amavis/conf.d/61-dms_auto_generated" @@ -1381,10 +1381,10 @@ function _setup_security_stack() { # Spamassassin if [ "$ENABLE_SPAMASSASSIN" = 0 ]; then - notify 'warn' "Spamassassin is disabled. You can enable it with 'ENABLE_SPAMASSASSIN=1'" + _notify 'warn' "Spamassassin is disabled. You can enable it with 'ENABLE_SPAMASSASSIN=1'" echo "@bypass_spam_checks_maps = (1);" >> $dms_amavis_file elif [ "$ENABLE_SPAMASSASSIN" = 1 ]; then - notify 'inf' "Enabling and configuring spamassassin" + _notify 'inf' "Enabling and configuring spamassassin" SA_TAG=${SA_TAG:="2.0"} && sed -i -r 's/^\$sa_tag_level_deflt (.*);/\$sa_tag_level_deflt = '$SA_TAG';/g' /etc/amavis/conf.d/20-debian_defaults SA_TAG2=${SA_TAG2:="6.31"} && sed -i -r 's/^\$sa_tag2_level_deflt (.*);/\$sa_tag2_level_deflt = '$SA_TAG2';/g' /etc/amavis/conf.d/20-debian_defaults SA_KILL=${SA_KILL:="6.31"} && sed -i -r 's/^\$sa_kill_level_deflt (.*);/\$sa_kill_level_deflt = '$SA_KILL';/g' /etc/amavis/conf.d/20-debian_defaults @@ -1412,7 +1412,7 @@ function _setup_security_stack() { if [ "$SPAMASSASSIN_SPAM_TO_INBOX" = 1 ]; then - notify 'inf' "Configure Spamassassin/Amavis to put SPAM inbox" + _notify 'inf' "Configure Spamassassin/Amavis to put SPAM inbox" sed -i "s/\$final_spam_destiny.*=.*$/\$final_spam_destiny = D_PASS;/g" /etc/amavis/conf.d/49-docker-mailserver sed -i "s/\$final_bad_header_destiny.*=.*$/\$final_bad_header_destiny = D_PASS;/g" /etc/amavis/conf.d/49-docker-mailserver @@ -1421,7 +1421,7 @@ function _setup_security_stack() { sed -i "s/\$final_bad_header_destiny.*=.*$/\$final_bad_header_destiny = D_BOUNCE;/g" /etc/amavis/conf.d/49-docker-mailserver if [ "${DEFAULT_VARS['EXPLICITLY_DEFINED_SPAMASSASSIN_SPAM_TO_INBOX']}" = 0 ]; then - notify 'warn' "Spam messages WILL NOT BE DELIVERED, you will NOT be notified of ANY message bounced. Please define SPAMASSASSIN_SPAM_TO_INBOX explicitly." + _notify 'warn' "Spam messages WILL NOT BE DELIVERED, you will NOT be notified of ANY message bounced. Please define SPAMASSASSIN_SPAM_TO_INBOX explicitly." fi fi @@ -1429,10 +1429,10 @@ function _setup_security_stack() { # Clamav if [ "$ENABLE_CLAMAV" = 0 ]; then - notify 'warn' "Clamav is disabled. You can enable it with 'ENABLE_CLAMAV=1'" + _notify 'warn' "Clamav is disabled. You can enable it with 'ENABLE_CLAMAV=1'" echo "@bypass_virus_checks_maps = (1);" >> $dms_amavis_file elif [ "$ENABLE_CLAMAV" = 1 ]; then - notify 'inf' "Enabling clamav" + _notify 'inf' "Enabling clamav" fi echo "1; # ensure a defined return" >> $dms_amavis_file @@ -1440,7 +1440,7 @@ function _setup_security_stack() { # Fail2ban if [ "$ENABLE_FAIL2BAN" = 1 ]; then - notify 'inf' "Fail2ban enabled" + _notify 'inf' "Fail2ban enabled" test -e /tmp/docker-mailserver/fail2ban-fail2ban.cf && cp /tmp/docker-mailserver/fail2ban-fail2ban.cf /etc/fail2ban/fail2ban.local test -e /tmp/docker-mailserver/fail2ban-jail.cf && cp /tmp/docker-mailserver/fail2ban-jail.cf /etc/fail2ban/jail.local else @@ -1458,20 +1458,20 @@ function _setup_security_stack() { } function _setup_logrotate() { - notify 'inf' "Setting up logrotate" + _notify 'inf' "Setting up logrotate" LOGROTATE="/var/log/mail/mail.log\n{\n compress\n copytruncate\n delaycompress\n" case "$LOGROTATE_INTERVAL" in "daily" ) - notify 'inf' "Setting postfix logrotate interval to daily" + _notify 'inf' "Setting postfix logrotate interval to daily" LOGROTATE="$LOGROTATE rotate 1\n daily\n" ;; "weekly" ) - notify 'inf' "Setting postfix logrotate interval to weekly" + _notify 'inf' "Setting postfix logrotate interval to weekly" LOGROTATE="$LOGROTATE rotate 1\n weekly\n" ;; "monthly" ) - notify 'inf' "Setting postfix logrotate interval to monthly" + _notify 'inf' "Setting postfix logrotate interval to monthly" LOGROTATE="$LOGROTATE rotate 1\n monthly\n" ;; esac @@ -1480,17 +1480,17 @@ function _setup_logrotate() { } function _setup_mail_summary() { - notify 'inf' "Enable postfix summary with recipient $PFLOGSUMM_RECIPIENT" + _notify 'inf' "Enable postfix summary with recipient $PFLOGSUMM_RECIPIENT" case "$PFLOGSUMM_TRIGGER" in "daily_cron" ) - notify 'inf' "Creating daily cron job for pflogsumm report" + _notify 'inf' "Creating daily cron job for pflogsumm report" echo "#!/bin/bash" > /etc/cron.daily/postfix-summary echo "/usr/local/bin/report-pflogsumm-yesterday $HOSTNAME $PFLOGSUMM_RECIPIENT $PFLOGSUMM_SENDER" \ >> /etc/cron.daily/postfix-summary chmod +x /etc/cron.daily/postfix-summary ;; "logrotate" ) - notify 'inf' "Add postrotate action for pflogsumm report" + _notify 'inf' "Add postrotate action for pflogsumm report" sed -i "s|}| postrotate\n /usr/local/bin/postfix-summary $HOSTNAME \ $PFLOGSUMM_RECIPIENT $PFLOGSUMM_SENDER\n endscript\n}\n|" /etc/logrotate.d/maillog ;; @@ -1498,18 +1498,18 @@ function _setup_mail_summary() { } function _setup_logwatch() { - notify 'inf' "Enable logwatch reports with recipient $LOGWATCH_RECIPIENT" + _notify 'inf' "Enable logwatch reports with recipient $LOGWATCH_RECIPIENT" echo "LogFile = /var/log/mail/freshclam.log" >> /etc/logwatch/conf/logfiles/clam-update.conf case "$LOGWATCH_INTERVAL" in "daily" ) - notify 'inf' "Creating daily cron job for logwatch reports" + _notify 'inf' "Creating daily cron job for logwatch reports" echo "#!/bin/bash" > /etc/cron.daily/logwatch echo "/usr/sbin/logwatch --range Yesterday --hostname $HOSTNAME --mailto $LOGWATCH_RECIPIENT" \ >> /etc/cron.daily/logwatch chmod 744 /etc/cron.daily/logwatch ;; "weekly" ) - notify 'inf' "Creating weekly cron job for logwatch reports" + _notify 'inf' "Creating weekly cron job for logwatch reports" echo "#!/bin/bash" > /etc/cron.weekly/logwatch echo "/usr/sbin/logwatch --range 'between -7 days and -1 days' --hostname $HOSTNAME --mailto $LOGWATCH_RECIPIENT" \ >> /etc/cron.weekly/logwatch @@ -1519,19 +1519,19 @@ function _setup_logwatch() { } function _setup_user_patches() { - notify 'inf' 'Executing user-patches.sh' + _notify 'inf' 'Executing user-patches.sh' if [ -f /tmp/docker-mailserver/user-patches.sh ]; then chmod +x /tmp/docker-mailserver/user-patches.sh /tmp/docker-mailserver/user-patches.sh - notify 'inf' "Executed 'config/user-patches.sh'" + _notify 'inf' "Executed 'config/user-patches.sh'" else - notify 'inf' "No user patches executed because optional '/tmp/docker-mailserver/user-patches.sh' is not provided." + _notify 'inf' "No user patches executed because optional '/tmp/docker-mailserver/user-patches.sh' is not provided." fi } function _setup_environment() { - notify 'task' 'Setting up /etc/environment' + _notify 'task' 'Setting up /etc/environment' local banner="# docker environment" local var @@ -1554,27 +1554,27 @@ function _setup_environment() { # Description: Place functions for temporary workarounds and fixes here ########################################################################## function fix() { - notify 'taskgrg' "Post-configuration checks..." + _notify 'taskgrg' "Post-configuration checks..." for _func in "${FUNCS_FIX[@]}";do $_func [ $? != 0 ] && defunc done - notify 'taskgrg' "Remove leftover pid files from a stop/start" + _notify 'taskgrg' "Remove leftover pid files from a stop/start" rm -rf /var/run/*.pid /var/run/*/*.pid touch /dev/shm/supervisor.sock } function _fix_var_mail_permissions() { - notify 'task' 'Checking /var/mail permissions' + _notify 'task' 'Checking /var/mail permissions' # Fix permissions, but skip this if 3 levels deep the user id is already set if [ `find /var/mail -maxdepth 3 -a \( \! -user 5000 -o \! -group 5000 \) | grep -c .` != 0 ]; then - notify 'inf' "Fixing /var/mail permissions" + _notify 'inf' "Fixing /var/mail permissions" chown -R 5000:5000 /var/mail else - notify 'inf' "Permissions in /var/mail look OK" + _notify 'inf' "Permissions in /var/mail look OK" return 0 fi } @@ -1585,27 +1585,27 @@ function _fix_var_amavis_permissions() { else amavis_state_dir=/var/mail-state/lib-amavis fi - notify 'task' 'Checking $amavis_state_dir permissions' + _notify 'task' 'Checking $amavis_state_dir permissions' amavis_permissions_status=$(find -H $amavis_state_dir -maxdepth 3 -a \( \! -user amavis -o \! -group amavis \)) if [ -n "$amavis_permissions_status" ]; then - notify 'inf' "Fixing $amavis_state_dir permissions" + _notify 'inf' "Fixing $amavis_state_dir permissions" chown -hR amavis:amavis $amavis_state_dir else - notify 'inf' "Permissions in $amavis_state_dir look OK" + _notify 'inf' "Permissions in $amavis_state_dir look OK" return 0 fi } function _fix_cleanup_clamav() { - notify 'task' 'Cleaning up disabled Clamav' + _notify 'task' 'Cleaning up disabled Clamav' rm -f /etc/logrotate.d/clamav-* rm -f /etc/cron.d/clamav-freshclam } function _fix_cleanup_spamassassin() { - notify 'task' 'Cleaning up disabled spamassassin' + _notify 'task' 'Cleaning up disabled spamassassin' rm -f /etc/cron.daily/spamassassin } @@ -1620,7 +1620,7 @@ function _fix_cleanup_spamassassin() { # Description: Place functions that do not fit in the sections above here ########################################################################## function misc() { - notify 'taskgrp' 'Starting Misc' + _notify 'taskgrp' 'Starting Misc' for _func in "${FUNCS_MISC[@]}";do $_func @@ -1632,25 +1632,25 @@ function _misc_save_states() { # consolidate all states into a single directory (`/var/mail-state`) to allow persistence using docker volumes statedir=/var/mail-state if [ "$ONE_DIR" = 1 -a -d $statedir ]; then - notify 'inf' "Consolidating all state onto $statedir" + _notify 'inf' "Consolidating all state onto $statedir" for d in /var/spool/postfix /var/lib/postfix /var/lib/amavis /var/lib/clamav /var/lib/spamassassin /var/lib/fail2ban /var/lib/postgrey /var/lib/dovecot; do dest=$statedir/`echo $d | sed -e 's/.var.//; s/\//-/g'` if [ -d $dest ]; then - notify 'inf' " Destination $dest exists, linking $d to it" + _notify 'inf' " Destination $dest exists, linking $d to it" rm -rf $d ln -s $dest $d elif [ -d $d ]; then - notify 'inf' " Moving contents of $d to $dest:" `ls $d` + _notify 'inf' " Moving contents of $d to $dest:" `ls $d` mv $d $dest ln -s $dest $d else - notify 'inf' " Linking $d to $dest" + _notify 'inf' " Linking $d to $dest" mkdir -p $dest ln -s $dest $d fi done - notify 'inf' 'Fixing /var/mail-state/* permissions' + _notify 'inf' 'Fixing /var/mail-state/* permissions' chown -R clamav /var/mail-state/lib-clamav chown -R postfix /var/mail-state/lib-postfix chown -R postgrey /var/mail-state/lib-postgrey @@ -1664,7 +1664,7 @@ function _misc_save_states() { # >> Start Daemons ########################################################################## function start_daemons() { - notify 'taskgrp' 'Starting mail server' + _notify 'taskgrp' 'Starting mail server' for _func in "${DAEMONS_START[@]}";do $_func @@ -1673,22 +1673,22 @@ function start_daemons() { } function _start_daemons_cron() { - notify 'task' 'Starting cron' 'n' + _notify 'task' 'Starting cron' 'n' supervisorctl start cron } function _start_daemons_rsyslog() { - notify 'task' 'Starting rsyslog ' 'n' + _notify 'task' 'Starting rsyslog ' 'n' supervisorctl start rsyslog } function _start_daemons_saslauthd() { - notify 'task' 'Starting saslauthd' 'n' + _notify 'task' 'Starting saslauthd' 'n' supervisorctl start "saslauthd_${SASLAUTHD_MECHANISMS}" } function _start_daemons_fail2ban() { - notify 'task' 'Starting fail2ban ' 'n' + _notify 'task' 'Starting fail2ban ' 'n' touch /var/log/auth.log # Delete fail2ban.sock that probably was left here after container restart if [ -e /var/run/fail2ban/fail2ban.sock ]; then @@ -1698,32 +1698,32 @@ function _start_daemons_fail2ban() { } function _start_daemons_opendkim() { - notify 'task' 'Starting opendkim ' 'n' + _notify 'task' 'Starting opendkim ' 'n' supervisorctl start opendkim } function _start_daemons_opendmarc() { - notify 'task' 'Starting opendmarc ' 'n' + _notify 'task' 'Starting opendmarc ' 'n' supervisorctl start opendmarc } function _start_daemons_postsrsd(){ - notify 'task' 'Starting postsrsd ' 'n' + _notify 'task' 'Starting postsrsd ' 'n' supervisorctl start postsrsd } function _start_daemons_postfix() { - notify 'task' 'Starting postfix' 'n' + _notify 'task' 'Starting postfix' 'n' supervisorctl start postfix } function _start_daemons_dovecot() { # Here we are starting sasl and imap, not pop3 because it's disabled by default - notify 'task' 'Starting dovecot services' 'n' + _notify 'task' 'Starting dovecot services' 'n' if [ "$ENABLE_POP3" = 1 ]; then - notify 'task' 'Starting pop3 services' 'n' + _notify 'task' 'Starting pop3 services' 'n' mv /etc/dovecot/protocols.d/pop3d.protocol.disab /etc/dovecot/protocols.d/pop3d.protocol fi @@ -1744,25 +1744,25 @@ function _start_daemons_dovecot() { } function _start_daemons_fetchmail() { - notify 'task' 'Starting fetchmail' 'n' + _notify 'task' 'Starting fetchmail' 'n' /usr/local/bin/setup-fetchmail supervisorctl start fetchmail } function _start_daemons_clamav() { - notify 'task' 'Starting clamav' 'n' + _notify 'task' 'Starting clamav' 'n' supervisorctl start clamav } function _start_daemons_postgrey() { - notify 'task' 'Starting postgrey' 'n' + _notify 'task' 'Starting postgrey' 'n' rm -f /var/run/postgrey/postgrey.pid supervisorctl start postgrey } function _start_daemons_amavis() { - notify 'task' 'Starting amavis' 'n' + _notify 'task' 'Starting amavis' 'n' supervisorctl start amavis } @@ -1776,7 +1776,7 @@ function _start_daemons_amavis() { ########################################################################## function _start_changedetector() { - notify 'task' 'Starting changedetector' 'n' + _notify 'task' 'Starting changedetector' 'n' supervisorctl start changedetector } @@ -1789,23 +1789,23 @@ function _start_changedetector() { . /usr/local/bin/helper_functions.sh if [[ ${DEFAULT_VARS["DMS_DEBUG"]} == 1 ]]; then -notify 'taskgrp' "" -notify 'taskgrp' "#" -notify 'taskgrp' "#" -notify 'taskgrp' "# ENV" -notify 'taskgrp' "#" -notify 'taskgrp' "#" -notify 'taskgrp' "" +_notify 'taskgrp' "" +_notify 'taskgrp' "#" +_notify 'taskgrp' "#" +_notify 'taskgrp' "# ENV" +_notify 'taskgrp' "#" +_notify 'taskgrp' "#" +_notify 'taskgrp' "" printenv fi -notify 'taskgrp' "" -notify 'taskgrp' "#" -notify 'taskgrp' "#" -notify 'taskgrp' "# docker-mailserver" -notify 'taskgrp' "#" -notify 'taskgrp' "#" -notify 'taskgrp' "" +_notify 'taskgrp' "" +_notify 'taskgrp' "#" +_notify 'taskgrp' "#" +_notify 'taskgrp' "# docker-mailserver" +_notify 'taskgrp' "#" +_notify 'taskgrp' "#" +_notify 'taskgrp' "" register_functions @@ -1815,11 +1815,11 @@ fix misc start_daemons -notify 'taskgrp' "" -notify 'taskgrp' "#" -notify 'taskgrp' "# $HOSTNAME is up and running" -notify 'taskgrp' "#" -notify 'taskgrp' "" +_notify 'taskgrp' "" +_notify 'taskgrp' "#" +_notify 'taskgrp' "# $HOSTNAME is up and running" +_notify 'taskgrp' "#" +_notify 'taskgrp' "" touch /var/log/mail/mail.log tail -fn 0 /var/log/mail/mail.log