d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update this script so that it handles different ruleset failures

Browse Source 
differently.  The output now shows the ruleset and shortens to
slightly different text (using $daily_status_mail_rejects_shorten),
but it should be more descriptive.

PR:		35018
Inspired by:	Mikhail Teterin - mi at aldan dot algebra dot com
MFC after:	3 weeks
This commit is contained in:
Brian Somers 2009-05-28 07:43:06 +00:00
parent a28042d1e3
commit 48369f7cc0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=192970
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/periodic/daily/460.status-mail-rejects
View File

@ -12,10 +12,8 @@ then
fi fi
case "$daily_status_mail_rejects_shorten" in case "$daily_status_mail_rejects_shorten" in
[Yy][Ee][Ss]) [Yy][Ee][Ss]) shorten='cut -d" " -f2,3';;
sed_output='\4 \3...';; *) shorten=cat;;
*)
sed_output='\2 (\3... \4)';;
esac esac
case "$daily_status_mail_rejects_enable" in case "$daily_status_mail_rejects_enable" in
@ -39,7 +37,8 @@ case "$daily_status_mail_rejects_enable" in
echo echo
echo Checking for rejected mail hosts: echo Checking for rejected mail hosts:
start=`date -v-1d '+%b %e'` yesterday=$(date -v-1d '+%b %e')
today=$(date '+%b %e')
n=$(($daily_status_mail_rejects_logs - 2)) n=$(($daily_status_mail_rejects_logs - 2))
rc=$({ rc=$({
while [ $n -ge 0 ] while [ $n -ge 0 ]
@ -57,9 +56,14 @@ case "$daily_status_mail_rejects_enable" in
n=$(($n - 1)) n=$(($n - 1))
done done
cat /var/log/maillog cat /var/log/maillog
} | } | sed -Ene "/^$today/q" -e "/^$yesterday/{"'
sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=<?([^@]+@)?([^>,]+).*reject=([^ ]+) .* ([^ ]+)$/'"$sed_output"'/p' | s/.*ruleset=check_relay,.* relay=([^,]+), reject=([^ ]*).*/\2 check_relay \1/p
sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) t end
s/.*ruleset=check_rcpt,.* arg1=<?([^>,]+).* reject=([^ ]+) .* ([^ ]+)/\2 check_rcpt \1 \3/p
t end
s/.*ruleset=check_([^,]+),.* arg1=<?([^@]+@)?([^>,]+).* reject=([^ ]+) .* ([^ ]+)/\4 check_\1 \3 \5/p
:end
}' | eval $shorten | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l)
[ $rc -gt 0 ] && rc=1 [ $rc -gt 0 ] && rc=1
fi;; fi;;