From d6ccb7c7a46ce386083a9a24d22c36d002032086 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Tue, 3 Oct 2017 16:17:39 +0200 Subject: [PATCH] ADD Nginx Mainstream Test (Step 16) --- .dev-tools/_conf_files_test4/default.vhost | 10 +++++----- .dev-tools/default13.vhost | 15 +++++++++++++++ .dev-tools/install-nginx-4.sh | 3 +++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 .dev-tools/default13.vhost diff --git a/.dev-tools/_conf_files_test4/default.vhost b/.dev-tools/_conf_files_test4/default.vhost index 34ed06fd0..373547984 100644 --- a/.dev-tools/_conf_files_test4/default.vhost +++ b/.dev-tools/_conf_files_test4/default.vhost @@ -1,14 +1,14 @@ server { - # Bad Bot Blocker - include /etc/nginx/bots.d/ddos.conf; - include /etc/nginx/bots.d/blockbots.conf; - - listen *:9000; + listen *:9000; root /var/www/html; server_name localhost; charset UTF-8; + # Bad Bot Blocker + include /etc/nginx/bots.d/ddos.conf; + include /etc/nginx/bots.d/blockbots.conf; + location / { root /var/www/html/; } diff --git a/.dev-tools/default13.vhost b/.dev-tools/default13.vhost new file mode 100644 index 000000000..373547984 --- /dev/null +++ b/.dev-tools/default13.vhost @@ -0,0 +1,15 @@ +server { + listen *:9000; + + root /var/www/html; + server_name localhost; + charset UTF-8; + + # Bad Bot Blocker + include /etc/nginx/bots.d/ddos.conf; + include /etc/nginx/bots.d/blockbots.conf; + + location / { + root /var/www/html/; + } +} diff --git a/.dev-tools/install-nginx-4.sh b/.dev-tools/install-nginx-4.sh index bb5fcb23f..3437dacee 100755 --- a/.dev-tools/install-nginx-4.sh +++ b/.dev-tools/install-nginx-4.sh @@ -283,6 +283,9 @@ sudo bash ./setup-ngxblocker -x printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################" sudo service nginx reload +sudo cp $TRAVIS_BUILD_DIR/.dev-tools/default13.vhost /etc/nginx/sites-available/default.vhost +sudo service nginx reload + # ********************** # Now Run our Curl Tests # **********************