vikarti.anatra/nginx-ultimate-bad-bot-blocker
1
0
Fork 0
mirror of https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git synced 2025-09-02 10:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate check_mail_depends()

Browse source 
* move mail check into send_email()
This commit is contained in:
Stuart Cardall 2018-10-08 21:56:04 +00:00
parent 841e28f404
commit afb7cc526b
No known key found for this signature in database
GPG key ID: AEB857F1C891D0C6
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
update-ngxblocker
View file

@ -221,13 +221,6 @@ check_args() {
esac
}
check_mail_depends() {
if [ -z $(find_binary mail) ]; then # mailx + ssmtp are enough to send emails
printf "${BOLDYELLOW}WARN${RESET}: missing mail command => ${BOLDWHITE}disabling emails${RESET}.\n\n"
return 1
fi
}
check_depends() {
# centos does not have which by default
if [ -z $(find_binary curl) ]; then
@ -268,12 +261,14 @@ log_output() {
}
send_email() {
# email report
if check_mail_depends; then
# email report (mailx + ssmtp are enough to send emails)
if [ -n $(find_binary mail) ]; then
print_message "Emailing report to: ${BOLDWHITE}$EMAIL${RESET}\n\n";
# remove ansi colour codes
sed -i 's/\x1b\[[0-9;]*m//g' $EMAIL_REPORT
cat $EMAIL_REPORT | mail -s "Nginx Bad Bot Blocker Updated" $EMAIL
else
print_message "${BOLDYELLOW}WARN${RESET}: missing mail command => ${BOLDWHITE}disabling emails${RESET}.\n\n"
fi
}