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-01 18:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

REVERT Changes REF: #256 REF: #266

Browse source
This commit is contained in:
Mitchell Krog 2019-06-28 19:26:11 +02:00
parent e3f84aad7d
commit 1455b99621
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -46,14 +46,14 @@ script:
- bash .dev-tools/test-blocker-rate-limiting.sh
- bash .dev-tools/test-blocker-whitelist.sh
# HERE WE TEST update-ngxblocker setup-ngxblocker - DISABLED UNTIL FIXED
- bash .dev-tools/install-nginx-2.sh
#- bash .dev-tools/install-nginx-2.sh
#- bash .dev-tools/test-blocker-quick.sh
#- bash .dev-tools/install-nginx-3.sh
#- bash .dev-tools/test-blocker-quick.sh
#- bash .dev-tools/install-nginx-4.sh
#- bash .dev-tools/test-blocker-quick.sh
# FROM HERE WE TEST ANY NEW CHANGES TO THE BLOCKER
- bash .dev-tools/install-nginx-1.sh
#- bash .dev-tools/install-nginx-1.sh
- bash .dev-tools/beta-install-nginx-testing-of-changes.sh
- bash .dev-tools/beta-test-blocker.sh
- bash .dev-tools/beta-test-blocker-badwords.sh

4
setup-ngxblocker
View file

@ -426,8 +426,8 @@ main() {
col_size=$(( $(longest_str $CONF_FILES) + $(echo $CONF_DIR | wc -m) + 10 ))
# update main config
#line=$(find_includes $MAIN_CONF include last http first '\}' last )
line=$(find_includes $MAIN_CONF include last include last '\}' last )
line=$(find_includes $MAIN_CONF include last http first '\}' last )
#line=$(find_includes $MAIN_CONF include last include last '\}' last )
if [ -n "$(check_wildcard $MAIN_CONF $CONF_DIR)" ]; then # also recalculate column width
col_size=$(( $(longest_str $VHOST_INCLUDES) + $(echo $BOTS_DIR | wc -m) + 10 ))
printf "%-10s %-${col_size}s %s\n" "INFO:" "$CONF_DIR/* detected" "=> $MAIN_CONF"