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

This commit is contained in:
Mitchell Krog 2019-07-31 16:20:36 +02:00
parent 2b4f86d1f7
commit 6a9cf5c2fb
No known key found for this signature in database
GPG key ID: E02E9D10427B6A43
2 changed files with 13 additions and 7 deletions

View file

@ -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;

View file

@ -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
}
# -----------------