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-03 19:20:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[TESTS] new sed pattern / Multiple Vhosts Includes REF: #285

Browse source
This commit is contained in:
Mitchell Krog 2019-07-31 16:40:19 +02:00
parent 0e8e1521e3
commit 3fa2a33412
No known key found for this signature in database
GPG key ID: E02E9D10427B6A43
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.dev-tools/setup-ngxblocker/setup-ngxblocker
View file

@ -439,7 +439,8 @@ main() {
# update vhosts # update vhosts
for file in $FILE_LIST; do for file in $FILE_LIST; do
line=$(find_includes $file include last server_ last location first ) #line=$(find_includes $file include last server_ last location first )
line=$(sed -n '/server_/,/}/p' $file)
if [ -n "$(check_wildcard $file $BOTS_DIR)" ]; then if [ -n "$(check_wildcard $file $BOTS_DIR)" ]; then
# do not use wildcards in vhost files # do not use wildcards in vhost files

4
.dev-tools/test-setupngxblocker.sh
View file

@ -157,8 +157,8 @@ sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m
setup_ansible1 () { setup_ansible1 () {
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost
#sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -v ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ -x -e vhost sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -v ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ -x -e vhost
sed -i '/server_.*/a\\n### NGINX BOT BLOCKER INCLUDE\ninclude /etc/nginx/bots.d/blockbots.conf;\n' ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost #sed -i '/server_.*/a\\n### NGINX BOT BLOCKER INCLUDE\ninclude /etc/nginx/bots.d/blockbots.conf;\n' ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost
} }
# ----------------- # -----------------