From 0ecaeb1d67d1737d702d4bef1a45eb164adde951 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Sun, 4 Aug 2019 12:46:27 +0200 Subject: [PATCH] [BETA] Revert setup-ngxblocker changes --- .dev-tools/setup-ngxblocker/setup-ngxblocker | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.dev-tools/setup-ngxblocker/setup-ngxblocker b/.dev-tools/setup-ngxblocker/setup-ngxblocker index b7cac2c5c..7f12ede8b 100644 --- a/.dev-tools/setup-ngxblocker/setup-ngxblocker +++ b/.dev-tools/setup-ngxblocker/setup-ngxblocker @@ -439,9 +439,22 @@ main() { # update vhosts for file in $FILE_LIST; do - #line=$(find_includes $file include last server_ last location first ) - line=$(sed -n '/server_//}/p' $file) + line=$(find_includes $file include last server_ last location first ) + #line=$(sed -n '/server_/,/}/p') + #line='/server_/,/}/' + #if ! sed -n "${line}p" $file | grep -Ew ^[[:space:]]+root 1>/dev/null; then + # text="include $conf_dir/$(echo $include_list | awk '{print $1}');" + # sed -i "s|$text|$text\n|" $file + #fi + + #add comment above inserts + #text="include $conf_dir/$(echo $include_list | awk '{print $NF}');" + #sed -i "s|$text|\n\n ##\n # Nginx Bad Bot Blocker Includes\n # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker\n ##\n\t$text|" $file + + + + #ORIGINAL CODE 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"