ENABLE install-nginx-2 REF: #256 REF: #266

This commit is contained in:
Mitchell Krog 2019-06-28 21:36:21 +02:00
parent a843d5f21d
commit eebb8102f0
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
2 changed files with 3 additions and 4 deletions

View file

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

View file

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