mirror of
https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git
synced 2025-09-02 18:50:13 +00:00
add -o option for emails only on updates
* based on the original idea & PR from @ScrewLooseDan https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/pull/141
This commit is contained in:
parent
59eb8358d1
commit
3850507195
1 changed files with 31 additions and 12 deletions
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
EMAIL="me@myemail.com"
|
EMAIL="me@myemail.com"
|
||||||
SEND_EMAIL="N"
|
SEND_EMAIL="N"
|
||||||
|
SEND_EMAIL_UPDATE="N"
|
||||||
CONF_DIR=/etc/nginx/conf.d
|
CONF_DIR=/etc/nginx/conf.d
|
||||||
BOTS_DIR=/etc/nginx/bots.d
|
BOTS_DIR=/etc/nginx/bots.d
|
||||||
INSTALLER=/usr/local/sbin/install-ngxblocker
|
INSTALLER=/usr/local/sbin/install-ngxblocker
|
||||||
|
@ -56,6 +57,7 @@ Usage: $script [OPTIONS]
|
||||||
[ -e ] : Change @email address (default: $EMAIL)
|
[ -e ] : Change @email address (default: $EMAIL)
|
||||||
[ -m ] : Change mail (system alias) (default: $EMAIL)
|
[ -m ] : Change mail (system alias) (default: $EMAIL)
|
||||||
[ -n ] : Do not send email report (default: $SEND_EMAIL)
|
[ -n ] : Do not send email report (default: $SEND_EMAIL)
|
||||||
|
[ -o ] : Only send email on update (default: $SEND_EMAIL_UPDATE)
|
||||||
[ -q ] : Suppress non error messages
|
[ -q ] : Suppress non error messages
|
||||||
[ -v ] : Print blacklist version
|
[ -v ] : Print blacklist version
|
||||||
[ -h ] : this help message
|
[ -h ] : this help message
|
||||||
|
@ -64,9 +66,10 @@ Examples:
|
||||||
$script (Download globalblacklist.conf to: $CONF_DIR)
|
$script (Download globalblacklist.conf to: $CONF_DIR)
|
||||||
$script -c /my/custom/conf.d (Download globalblacklist.conf to a custom location)
|
$script -c /my/custom/conf.d (Download globalblacklist.conf to a custom location)
|
||||||
$script -b /my/custom/bots.d (Download globalblacklist.conf & update with your custom bots.d location)
|
$script -b /my/custom/bots.d (Download globalblacklist.conf & update with your custom bots.d location)
|
||||||
$script -e yourname@youremailaddress.com (Download globalblacklist.conf specifying your email address for the notification)
|
$script -e you@youremail.com (Download globalblacklist.conf specifying your email address for the notification)
|
||||||
$script -u /path/to/install-ngxblocker (Use custom path to install-ngxblocker to update bots.d / conf.d include files)
|
$script -u /path/to/install-ngxblocker (Use custom path to install-ngxblocker to update bots.d / conf.d include files)
|
||||||
$script -q -m webmaster (Send mail to a system alias address & give less verbose messages for cron)
|
$script -q -m webmaster (Send mail to a system alias address & give less verbose messages for cron)
|
||||||
|
$script -o -e you@youremail.com (Send mail notification only on updates)
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
@ -207,7 +210,7 @@ check_args() {
|
||||||
check_mail_depends() {
|
check_mail_depends() {
|
||||||
if [ ! -f /usr/bin/mail ] && [ ! -f /bin/mail ]; then # mailx + ssmtp are enough to send emails
|
if [ ! -f /usr/bin/mail ] && [ ! -f /bin/mail ]; then # mailx + ssmtp are enough to send emails
|
||||||
printf "${BOLDYELLOW}WARN${RESET}: missing mail command => ${BOLDWHITE}disabling emails${RESET}.\n\n"
|
printf "${BOLDYELLOW}WARN${RESET}: missing mail command => ${BOLDWHITE}disabling emails${RESET}.\n\n"
|
||||||
SEND_EMAIL="N"
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,10 +236,21 @@ print_message() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
send_email() {
|
||||||
|
# email report
|
||||||
|
if check_mail_depends; 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
|
||||||
|
rm -f $EMAIL_REPORT
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
get_options() {
|
get_options() {
|
||||||
local arg= opts=
|
local arg= opts=
|
||||||
|
|
||||||
while getopts :c:b:u:r:e:m:nvqh opts "$@"
|
while getopts :c:b:u:r:e:m:novqh opts "$@"
|
||||||
do
|
do
|
||||||
if [ -n "${OPTARG}" ]; then
|
if [ -n "${OPTARG}" ]; then
|
||||||
case "$opts" in
|
case "$opts" in
|
||||||
|
@ -254,6 +268,7 @@ get_options() {
|
||||||
e) EMAIL=$arg; SEND_EMAIL=Y; check_args $opts email $arg ;;
|
e) EMAIL=$arg; SEND_EMAIL=Y; check_args $opts email $arg ;;
|
||||||
m) EMAIL=$arg; SEND_EMAIL=Y ;; # /etc/aliases no sanity checks
|
m) EMAIL=$arg; SEND_EMAIL=Y ;; # /etc/aliases no sanity checks
|
||||||
n) SEND_EMAIL=N ;;
|
n) SEND_EMAIL=N ;;
|
||||||
|
o) SEND_EMAIL_UPDATE=Y ;;
|
||||||
v) check_version; exit 0 ;;
|
v) check_version; exit 0 ;;
|
||||||
q) export VERBOSE=N ;;
|
q) export VERBOSE=N ;;
|
||||||
h) usage ;;
|
h) usage ;;
|
||||||
|
@ -332,22 +347,26 @@ main() {
|
||||||
if [ "$VERBOSE" = "N" ]; then
|
if [ "$VERBOSE" = "N" ]; then
|
||||||
printf "NGINX Blacklist updated =>$(grep "Version:" $CONF_DIR/globalblacklist.conf | tr -d '#')\n"
|
printf "NGINX Blacklist updated =>$(grep "Version:" $CONF_DIR/globalblacklist.conf | tr -d '#')\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# enable update only email
|
||||||
|
if [ "$SEND_EMAIL_UPDATE" = "Y" ] ; then
|
||||||
|
SEND_EMAIL=Y
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
# set custom bots.d path
|
# set custom bots.d path
|
||||||
update_paths $output
|
update_paths $output
|
||||||
|
|
||||||
|
# disable update only email
|
||||||
|
if [ "$SEND_EMAIL_UPDATE" = "Y" ] ; then
|
||||||
|
SEND_EMAIL=N
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# email report
|
# email report
|
||||||
check_mail_depends
|
|
||||||
case "$SEND_EMAIL" in
|
case "$SEND_EMAIL" in
|
||||||
y*|Y*) print_message "Emailing report to: ${BOLDWHITE}$EMAIL${RESET}\n\n";
|
y*|Y*) send_email;;
|
||||||
# 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
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
rm -f $EMAIL_REPORT
|
|
||||||
}
|
}
|
||||||
|
|
||||||
## start ##
|
## start ##
|
||||||
|
|
Loading…
Add table
Reference in a new issue