diff --git a/install_amavis.sh b/install_amavis.sh index 2252922..c46178d 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -4996,6 +4996,7 @@ fi ## - localhost:10025 inet n - y - - smtpd ## - -o content_filter= ## - -o smtpd_proxy_filter= +## - -o smtpd_milters= ## - -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128 ## - -o smtpd_client_restrictions= ## - -o smtpd_helo_restrictions= @@ -5070,6 +5071,8 @@ EOF localhost:10025 inet n - y - - smtpd -o content_filter= -o smtpd_proxy_filter= + -o smtpd_milters= + -o milter_macro_daemon_name=ORIGINATING -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= @@ -5132,6 +5135,8 @@ EOF localhost:10025 inet n - y - - smtpd -o content_filter= -o smtpd_proxy_filter= + -o smtpd_milters= + -o milter_macro_daemon_name=ORIGINATING -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= @@ -5184,6 +5189,8 @@ EOF localhost:10025 inet n - y - - smtpd -o content_filter= -o smtpd_proxy_filter= + -o smtpd_milters= + -o milter_macro_daemon_name=ORIGINATING -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= @@ -5220,6 +5227,8 @@ EOF localhost:10025 inet n - y - - smtpd -o content_filter= -o smtpd_proxy_filter= + -o smtpd_milters= + -o milter_macro_daemon_name=ORIGINATING -o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128 -o smtpd_client_restrictions= -o smtpd_helo_restrictions= diff --git a/install_postfix_advanced.sh b/install_postfix_advanced.sh index 8745065..2be6542 100755 --- a/install_postfix_advanced.sh +++ b/install_postfix_advanced.sh @@ -3058,20 +3058,18 @@ EOF # EOF - if [[ -n "$(which opendkim)" ]] && [[ -n "$(which opendmarc)" ]] ; then + if [[ -n "$(which opendkim)" ]] ; then cat <> /etc/postfix/main.cf -non_smtpd_milters = local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock -EOF - elif [[ -n "$(which opendkim)" ]] ; then - cat <> /etc/postfix/main.cf -non_smtpd_milters = local:/opendkim/opendkim.sock +non_smtpd_milters = local:/opendkim/opendkim.sock EOF else cat <> /etc/postfix/main.cf -non_smtpd_milters = local:/opendmarc/opendmarc.sock +non_smtpd_milters = EOF fi + else + cat <> /etc/postfix/main.cf