github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

chore: Consistent sed substitution delimiter +

Browse source 
This additionally converts `+` delimited to `|` standardizing it throughout the file.
This commit is contained in:
polarathene 2021-02-22 11:59:59 +13:00
parent 75aefa3bdf
commit 867cac6707
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/scripts/start-mailserver.sh
View file

@ -352,7 +352,7 @@ function _setup_supervisor
case ${SUPERVISOR_LOGLEVEL} in case ${SUPERVISOR_LOGLEVEL} in
critical | error | warn | info | debug ) critical | error | warn | info | debug )
sed -i -E \ sed -i -E \
"s+loglevel.*+loglevel = ${SUPERVISOR_LOGLEVEL}+g" \ "s|loglevel.*|loglevel = ${SUPERVISOR_LOGLEVEL}|g" \
/etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
;; ;;
@ -361,7 +361,7 @@ function _setup_supervisor
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'" "SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
sed -i -E \ sed -i -E \
"s+loglevel.*+loglevel = warn+g" \ "s|loglevel.*|loglevel = warn|g" \
/etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
;; ;;
esac esac
@ -832,7 +832,7 @@ function _setup_ldap
fi fi
# shellcheck disable=SC2016 # shellcheck disable=SC2016
sed -i 's+mydestination = \$myhostname, +mydestination = +' /etc/postfix/main.cf sed -i 's|mydestination = \$myhostname, |mydestination = |' /etc/postfix/main.cf
return 0 return 0
} }
@ -842,7 +842,7 @@ function _setup_postgrey
_notify 'inf' "Configuring postgrey" _notify 'inf' "Configuring postgrey"
sed -i -E \ sed -i -E \
's+, reject_rbl_client zen.spamhaus.org$+, reject_rbl_client zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023+' \ 's|, reject_rbl_client zen.spamhaus.org$|, reject_rbl_client zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023|' \
/etc/postfix/main.cf /etc/postfix/main.cf
sed -i -e \ sed -i -e \
@ -897,7 +897,7 @@ function _setup_spoof_protection
{ {
_notify 'inf' "Configuring Spoof Protection" _notify 'inf' "Configuring Spoof Protection"
sed -i \ sed -i \
's+smtpd_sender_restrictions =+smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,+' \ 's|smtpd_sender_restrictions =|smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,|' \
/etc/postfix/main.cf /etc/postfix/main.cf
if [[ ${ENABLE_LDAP} -eq 1 ]] if [[ ${ENABLE_LDAP} -eq 1 ]]
@ -941,10 +941,10 @@ EOF
if [[ ${ENABLE_SASLAUTHD} -eq 0 ]] && [[ ${SMTP_ONLY} -eq 1 ]] if [[ ${ENABLE_SASLAUTHD} -eq 0 ]] && [[ ${SMTP_ONLY} -eq 1 ]]
then then
sed -i -E \ sed -i -E \
's+^smtpd_sasl_auth_enable =.*+smtpd_sasl_auth_enable = no+g' \ 's|^smtpd_sasl_auth_enable =.*|smtpd_sasl_auth_enable = no|g' \
/etc/postfix/main.cf /etc/postfix/main.cf
sed -i -E \ sed -i -E \
's+^ -o smtpd_sasl_auth_enable=.*+ -o smtpd_sasl_auth_enable=no+g' \ 's|^ -o smtpd_sasl_auth_enable=.*| -o smtpd_sasl_auth_enable=no|g' \
/etc/postfix/master.cf /etc/postfix/master.cf
fi fi
} }
@ -1073,7 +1073,7 @@ function _setup_postfix_aliases
cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp
sed -i -E \ sed -i -E \
's+virtual_alias_maps(.*)+virtual_alias_maps\1 pcre:/etc/postfix/regexp+g' \ 's|virtual_alias_maps(.*)|virtual_alias_maps\1 pcre:/etc/postfix/regexp|g' \
/etc/postfix/main.cf /etc/postfix/main.cf
fi fi