Fix testing of whitelist-domain.conf | Change method of resetting in test-blocker

This commit is contained in:
Mitchell Krog 2019-06-24 16:46:49 +02:00
parent 10c9193ac1
commit 9d396d55be
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
2 changed files with 15 additions and 3 deletions

View file

@ -38,7 +38,19 @@ echo "${bold}${green}------------------------------------------------"
echo "${bold}${green}Disable any User Whitelisting and set to Default" echo "${bold}${green}Disable any User Whitelisting and set to Default"
echo "${bold}${green}------------------------------------------------" echo "${bold}${green}------------------------------------------------"
printf "\n\n" printf "\n\n"
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents-none.conf /etc/nginx/bots.d/blacklist-user-agents.conf
sudo rm /etc/nginx/conf.d/*.conf
sudo rm /etc/nginx/bots.d/*.conf
ls -la /etc/nginx/conf.d/
ls -la /etc/nginx/bots.d/
printf "\n"
echo "${bold}${magenta}-------------------------"
echo "${bold}${magenta}Execute update-ngxblocker"
echo "${bold}${magenta}-------------------------"
printf "\n"
cd /usr/sbin
sudo bash ./update-ngxblocker -n
echo "${bold}${green}---------------" echo "${bold}${green}---------------"
echo "${bold}${green}Reloading Nginx" echo "${bold}${green}Reloading Nginx"

View file

@ -42,6 +42,6 @@
# "~*\bmyfirstowndomainname\.com\b" 0; # "~*\bmyfirstowndomainname\.com\b" 0;
# "~*\bmy\-second\-owndomainname\.com\b" 0; # "~*\bmy\-second\-owndomainname\.com\b" 0;
"~*\bmyowndomain\.com\b" 0; "~*(?:\b)myowndomain\.com(?:\b|)" 0;
"~*\bmyotherdomain\.com\b" 0; "~*(?:\b)myotherdomain\.com(?:\b|)" 0;