From 21830c19b6da48b77fbcd30a4ed5761ef272a578 Mon Sep 17 00:00:00 2001 From: Stuart Cardall Date: Mon, 26 Feb 2018 20:41:26 +0000 Subject: [PATCH] do not add includes for redirect vhosts * adds a condition to only insert includes if a vhost file contains a root directive (to ignore vhosts which are simply redirects) * fixes https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/issues/138 --- setup-ngxblocker | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup-ngxblocker b/setup-ngxblocker index 32ab5b01b..d6bd88d88 100755 --- a/setup-ngxblocker +++ b/setup-ngxblocker @@ -390,10 +390,14 @@ main() { # update vhosts for file in $file_list; do line=$(find_includes $file include last server_ last location first ) + if [ -n "$(check_wildcard $file $BOTS_DIR)" ]; then + # do not use wildcards in vhost files printf "%-10s %-${col_size}s %s\n" "WARN:" "$BOTS_DIR/* detected" "=> $file" - else # don't use wildcards in vhost files - add_includes $line $file $BOTS_DIR $col_size $VHOST_INCLUDES + else # do not add includes to vhosts without root directive (i.e redirects) + if grep -Ew [[:space:]]+root $file 1>/dev/null; then + add_includes $line $file $BOTS_DIR $col_size $VHOST_INCLUDES + fi fi done