From eebb8102f070ae84d4557c9a541b18ef8509b2d7 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Fri, 28 Jun 2019 21:36:21 +0200 Subject: [PATCH] ENABLE install-nginx-2 REF: #256 REF: #266 --- .dev-tools/install-nginx-2.sh | 2 +- .travis.yml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh index 98baedcbf..9ef6ac459 100755 --- a/.dev-tools/install-nginx-2.sh +++ b/.dev-tools/install-nginx-2.sh @@ -132,7 +132,7 @@ sudo bash ./setup-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/b cat /etc/nginx/nginx.conf -sudo cat /usr/sbin/setup-ngxblocker +#sudo cat /usr/sbin/setup-ngxblocker # ************************ # Load our Nginx.conf file diff --git a/.travis.yml b/.travis.yml index b66c876cc..5f6a147f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ install: - sudo apt-get -y install dos2unix script: - #- bash .dev-tools/pull-data.sh - bash .dev-tools/generate-files.sh - bash .dev-tools/install-nginx-1.sh - bash .dev-tools/test-blocker-quick.sh @@ -46,14 +45,14 @@ script: - bash .dev-tools/test-blocker-rate-limiting.sh - bash .dev-tools/test-blocker-whitelist.sh # HERE WE TEST update-ngxblocker setup-ngxblocker - DISABLED UNTIL FIXED - #- bash .dev-tools/install-nginx-2.sh + - bash .dev-tools/install-nginx-2.sh #- bash .dev-tools/test-blocker-quick.sh #- bash .dev-tools/install-nginx-3.sh #- bash .dev-tools/test-blocker-quick.sh #- bash .dev-tools/install-nginx-4.sh #- bash .dev-tools/test-blocker-quick.sh # FROM HERE WE TEST ANY NEW CHANGES TO THE BLOCKER - #- bash .dev-tools/install-nginx-1.sh + - bash .dev-tools/install-nginx-1.sh - bash .dev-tools/beta-install-nginx-testing-of-changes.sh - bash .dev-tools/beta-test-blocker.sh - bash .dev-tools/beta-test-blocker-badwords.sh