From 8ebc9af274dbefec42ca5dcae6e318d59766870f Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Fri, 21 Jun 2019 08:21:22 +0200
Subject: [PATCH] Bring Nginx Test 2 Back Online

---
 .dev-tools/install-nginx-2.sh | 27 ++++++++++++++-------------
 .travis.yml                   |  4 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh
index 02e45805d..c1ad430e0 100755
--- a/.dev-tools/install-nginx-2.sh
+++ b/.dev-tools/install-nginx-2.sh
@@ -92,21 +92,14 @@ sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/def
 sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/index.php /var/www/html/index.php
 printf '\n%s\n%s\n%s\n\n' "#####################################" "Finished Nginx Setup for Nginx Test 2" "#####################################"
 
-# ***********************************************
-# Fetch our install-ngxblocker file from the repo
-# ***********************************************
+# *********************************************************
+# Fetch our install, updater and setup scriptsfrom the repo
+# *********************************************************
 
-printf '\n%s\n%s\n%s\n\n' "######################################" "Fetch install-ngxblocker from the repo" "######################################"
+printf '\n%s\n%s\n%s\n\n' "######################################" "Fetch setup and installer scripts from the repo" "######################################"
 sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/install-ngxblocker -O /usr/sbin/install-ngxblocker
-sudo chmod +x /usr/sbin/install-ngxblocker
-
-# **********************
-# Run Install-NgxBlocker
-# **********************
-
-printf '\n%s\n%s\n%s\n\n' "######################" "Run install-ngxblocker" "######################"
-cd /usr/sbin
-sudo bash ./install-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/bots.d
+sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/setup-ngxblocker -O /usr/sbin/setup-ngxblocker
+sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/update-ngxblocker -O /usr/sbin/update-ngxblocker
 
 # **************************************************
 # Set our install and setup scripts to be executable
@@ -117,6 +110,14 @@ sudo chmod +x /usr/sbin/install-ngxblocker
 sudo chmod +x /usr/sbin/setup-ngxblocker
 sudo chmod +x /usr/sbin/update-ngxblocker
 
+# **********************
+# Run Install-NgxBlocker
+# **********************
+
+printf '\n%s\n%s\n%s\n\n' "######################" "Run install-ngxblocker" "######################"
+cd /usr/sbin
+sudo bash ./install-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/bots.d
+
 # ********************
 # Run setup-ngxblocker
 # ********************
diff --git a/.travis.yml b/.travis.yml
index 616998b94..4bf51bc50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,8 @@ script:
   - bash .dev-tools/run-curl-tests-1.sh
   - bash .dev-tools/install-nginx-testing-of-changes.sh
   - bash .dev-tools/run-curl-tests-testing-of-changes.sh
-  #- bash .dev-tools/install-nginx-2.sh
-  #- bash .dev-tools/run-curl-tests-2.sh
+  - bash .dev-tools/install-nginx-2.sh
+  - bash .dev-tools/run-curl-tests-2.sh
   #- bash .dev-tools/install-nginx-3.sh
   #- bash .dev-tools/run-curl-tests-3.sh
   #- bash .dev-tools/install-nginx-4.sh