diff --git a/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost b/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost index 74799d1c4..0d3582c7f 100644 --- a/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost +++ b/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost @@ -2,6 +2,9 @@ server { listen 8080; server_name xxxx; +include /etc/nginx/bots.d/blockbots.conf; + + location / { return 301 https://$host$request_uri; } @@ -10,6 +13,9 @@ server { server { listen 443 ssl http2; server_name xxxxx + +include /etc/nginx/bots.d/blockbots.conf; + root {{ vhost_www_directory }}/sites/public; include {{ nginx_blockbots_cfg_path }}; @@ -26,6 +32,9 @@ server { root {{ vhost_www_directory }}/admin/public; server_name admin.{{ domain_to_protect }}; +include /etc/nginx/bots.d/blockbots.conf; + + include {{ nginx_yprox_security_path }}; include {{ nginx_yprox_ssl_path }}; @@ -40,13 +49,9 @@ server { listen 443 ssl http2; server_name alp.{{ domain_to_protect }}; - +include /etc/nginx/bots.d/blockbots.conf; + - ## - # Nginx Bad Bot Blocker Includes - # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker - ## - include /etc/nginx/bots.d/ddos.conf; root {{ alp_live_directory }}; include {{ nginx_bots_cfg_path }}/blockbots.conf; index index.html; diff --git a/.dev-tools/test-setupngxblocker.sh b/.dev-tools/test-setupngxblocker.sh index 25516d8e0..034251f60 100755 --- a/.dev-tools/test-setupngxblocker.sh +++ b/.dev-tools/test-setupngxblocker.sh @@ -157,7 +157,8 @@ sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m 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 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 } # -----------------