Update botblocker-nginx-settings.conf

This commit is contained in:
Mitchell Krog 2019-06-27 15:08:13 +02:00
parent 75056690c8
commit 01bbf29b51
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
4 changed files with 6 additions and 44 deletions

View file

@ -62,7 +62,7 @@ echo "${bold}${yellow}----------------------------------------------------------
printf "\n\n"
sleep 10s
ratelimittestfile=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/ratelimittest.txt
ratelimittestfile=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/ratelimittest-beta.txt
truncate -s 0 ${ratelimittestfile}
curl -A "GoogleBot" http://localhost:9000 2>&1 > ${ratelimittestfile} &
curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} &

View file

@ -57,18 +57,12 @@ printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/
printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
printf '%s\t%s\n' "127.0.0.1" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf
# TEST ANY CHANGES TO botblocker-nginx-settings.conf
sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/botblocker-nginx-settings.conf /etc/nginx/conf.d/botblocker-nginx-settings.conf
#printf "\n"
#echo "${bold}${yellow}---------------------------------------------------"
#echo "${bold}${yellow}Copy Test Unit of globalblacklist.conf file to test"
#echo "${bold}${yellow}---------------------------------------------------"
#printf "\n"
#sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf
echo "${bold}${green}---------------"
echo "${bold}${green}Reloading Nginx"

View file

@ -30,40 +30,6 @@ cyan=$(tput setaf 6)
white=$(tput setaf 7)
defaultcolor=$(tput setaf default)
# *******************************************
# Set Location of our Curl Test Results Files
# *******************************************
#echo "${bold}${green}------------------------------------------------"
#echo "${bold}${green}Disable any User Whitelisting and set to Default"
#echo "${bold}${green}------------------------------------------------"
#printf "\n\n"
#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}Reloading Nginx"
#echo "${bold}${green}---------------"
#printf "\n\n"
#sudo nginx -t && sudo nginx -s reload
#echo "${bold}${yellow}-----------------------------------------------------------------------"
#echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis"
#echo "${bold}${yellow}-----------------------------------------------------------------------"
#printf "\n\n"
#sleep 10s
echo "${bold}${green}--------------"
echo "${bold}${green}Tests Starting"
echo "${bold}${green}--------------"

View file

@ -13,8 +13,10 @@
# Version 1.1
# ! new directives also to be added to include_filelist.txt ! #
server_names_hash_bucket_size 128;
server_names_hash_bucket_size 256;
server_names_hash_max_size 4096;
variables_hash_max_size 4096;
variables_hash_bucket_size 4096;
limit_req_zone $binary_remote_addr zone=flood:50m rate=90r/s;
limit_conn_zone $binary_remote_addr zone=addr:50m;