install/mailsystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_opendmarc.sh: no opendmarc check on non_smtpd connections.

Browse Source
This commit is contained in:
Christoph
2026-02-10 15:02:05 +01:00
parent b4b47d5a79
commit 16618f9949
1 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
install_opendmarc.sh
View File

@@ -881,26 +881,26 @@ else
error "$(cat $log_file)" error "$(cat $log_file)"
fi fi
echononl " Set Variable non_smtpd_milters at '/etc/postfix/main.cf'.." #echononl " Set Variable non_smtpd_milters at '/etc/postfix/main.cf'.."
if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*opendkim.sock" /etc/postfix/main.cf 2> /dev/null) ; then #if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*opendkim.sock" /etc/postfix/main.cf 2> /dev/null) ; then
if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*$(basename "${opendmarc_socket_file}")" /etc/postfix/main.cf); then # if $(grep -q -E "^\s*non_smtpd_milters\s*=\s*.*$(basename "${opendmarc_socket_file}")" /etc/postfix/main.cf); then
echo_skipped # echo_skipped
else # else
perl -i -n -p -e "s&^\s*(non_smtpd_milters\s*=.*opendkim.sock)&\1,local:/$(basename "${opendmarc_socket_dir}")/$(basename "${opendmarc_socket_file}")&" \ # perl -i -n -p -e "s&^\s*(non_smtpd_milters\s*=.*opendkim.sock)&\1,local:/$(basename "${opendmarc_socket_dir}")/$(basename "${opendmarc_socket_file}")&" \
/etc/postfix/main.cf > $log_file 2>&1 # /etc/postfix/main.cf > $log_file 2>&1
if [[ $? -eq 0 ]] ; then # if [[ $? -eq 0 ]] ; then
echo_ok # echo_ok
postfix_needs_restart=true # postfix_needs_restart=true
else # else
echo_failed # echo_failed
error "$(cat $log_file)" # error "$(cat $log_file)"
fi # fi
fi # fi
else #else
#
echo_skipped # echo_skipped
warn "non_smtpd_milters is not adjusted. Complete Postfix configuration (main.cf) manually\!" # warn "non_smtpd_milters is not adjusted. Complete Postfix configuration (main.cf) manually\!"
fi #fi
echononl " Set Variable smtpd_milters at '/etc/postfix/main.cf'.." echononl " Set Variable smtpd_milters at '/etc/postfix/main.cf'.."
@@ -975,53 +975,53 @@ EOF
fi fi
if grep -q -E "^\s*#?\s*non_smtpd_milters\s*=" ${main_cf_file} ; then #if grep -q -E "^\s*#?\s*non_smtpd_milters\s*=" ${main_cf_file} ; then
ensure_dmarc_var "non_smtpd_milters" > "${tmp_main_cf_file}"
cp "${tmp_main_cf_file}" "${main_cf_file}"
else
cat <<EOF >> /etc/postfix/main.cf 2> $log_file
# Was sind non_smtpd_milters?
# #
# non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT # ensure_dmarc_var "non_smtpd_milters" > "${tmp_main_cf_file}"
# der smtpd-Daemon sind. # cp "${tmp_main_cf_file}" "${main_cf_file}"
# #
# Das betrifft z. B.: #else
# #
# cleanup Header/Content-Bereinigung # cat <<EOF >> /etc/postfix/main.cf 2> $log_file
# qmgr Queue-Manager
# lmtp / smtp Auslieferung nach extern
# local lokale Zustellung
# #
# Das sind z. B.: ## Was sind non_smtpd_milters?
# ##
# - interne Bounces (MAILER-DAEMON) ## non_smtpd_milters gilt für alle Postfix-Prozesse, die Mails verarbeiten, aber NICHT
# ## der smtpd-Daemon sind.
# - Cron-Mails vom Server ##
# ## Das betrifft z. B.:
# - Weiterleitungen, die Postfix selbst generiert ##
# ## cleanup Header/Content-Bereinigung
# - Mails, die über sendmail CLI gesendet werden ## qmgr Queue-Manager
# ## lmtp / smtp Auslieferung nach extern
# - Mails, die Amavis über LMTP zurückgibt ## local lokale Zustellung
# ##
# - etc. ## Das sind z. B.:
# ##
# ## - interne Bounces (MAILER-DAEMON)
# DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden. ##
non_smtpd_milters = $opendmarc_socket_string ## - Cron-Mails vom Server
EOF ##
fi ## - Weiterleitungen, die Postfix selbst generiert
postfix_needs_restart=true ##
if [[ $? -eq 0 ]] ; then ## - Mails, die über sendmail CLI gesendet werden
echo_ok ##
else ## - Mails, die Amavis über LMTP zurückgibt
echo_failed ##
error "$(cat $log_file)" ## - etc.
fi ##
##
## DKIM soll auch die ausgehenden Mails signieren, die nicht über smtpd daemon versendet werden.
#non_smtpd_milters = $opendmarc_socket_string
#EOF
#fi
#postfix_needs_restart=true
#if [[ $? -eq 0 ]] ; then
# echo_ok
#else
# echo_failed
# error "$(cat $log_file)"
#fi
echo "" echo ""