diff --git a/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf index 60959195e..7ff066d24 100644 --- a/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf @@ -33,4 +33,4 @@ # 111.111.111.111 0; -35.192.85.2 0; +104.154.113.151 0; diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index 6c6f1dca8..e10064b6b 100644 --- a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1448 -### Updated: Thu Jun 20 14:20:51 SAST 2019 +### Version: V3.2019.06.1449 +### Updated: Thu Jun 20 14:49:39 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test1/default.vhost b/.dev-tools/_conf_files_test1/default.vhost new file mode 100644 index 000000000..34ed06fd0 --- /dev/null +++ b/.dev-tools/_conf_files_test1/default.vhost @@ -0,0 +1,15 @@ +server { + # Bad Bot Blocker + include /etc/nginx/bots.d/ddos.conf; + include /etc/nginx/bots.d/blockbots.conf; + + listen *:9000; + + root /var/www/html; + server_name localhost; + charset UTF-8; + + location / { + root /var/www/html/; + } +} diff --git a/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf index c2894a093..ab187abf1 100644 --- a/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf @@ -33,5 +33,5 @@ # 111.111.111.111 0; -35.184.226.236 0; -35.192.85.2 0; +35.192.187.174 0; +35.188.73.34 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index 2590d9401..62564daf1 100644 --- a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1448 -### Updated: Thu Jun 20 14:20:51 SAST 2019 +### Version: V3.2019.06.1449 +### Updated: Thu Jun 20 14:49:39 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test2/default.vhost b/.dev-tools/_conf_files_test2/default.vhost new file mode 100644 index 000000000..76f396337 --- /dev/null +++ b/.dev-tools/_conf_files_test2/default.vhost @@ -0,0 +1,15 @@ +server { + # Bad Bot Blocker + include /usr/local/nginx/bots.d/ddos.conf; + include /usr/local/nginx/bots.d/blockbots.conf; + + listen *:9000; + + root /var/www/html; + server_name localhost; + charset UTF-8; + + location / { + root /var/www/html/; + } +} diff --git a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf index b6cfa5fef..7ff066d24 100644 --- a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf @@ -33,5 +33,4 @@ # 111.111.111.111 0; -35.184.96.71 0; -104.154.120.187 0; +104.154.113.151 0; diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf index ed66d0629..218fa8202 100644 --- a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1448 -### Updated: Thu Jun 20 14:20:51 SAST 2019 +### Version: V3.2019.06.1449 +### Updated: Thu Jun 20 14:49:39 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test3/default.vhost b/.dev-tools/_conf_files_test3/default.vhost new file mode 100644 index 000000000..a88ecafb9 --- /dev/null +++ b/.dev-tools/_conf_files_test3/default.vhost @@ -0,0 +1,15 @@ +server { + # Bad Bot Blocker + include /etc/nginx/mybots.d/ddos.conf; + include /etc/nginx/mybots.d/blockbots.conf; + + listen *:9000; + + root /var/www/html; + server_name localhost; + charset UTF-8; + + location / { + root /var/www/html/; + } +} diff --git a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf index 6fa8dae9a..5b84f76ab 100644 --- a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf @@ -33,5 +33,5 @@ # 111.111.111.111 0; -35.184.96.71 0; -35.224.112.202 0; +35.192.187.174 0; +35.192.136.167 0; diff --git a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf index 6c6f1dca8..e10064b6b 100644 --- a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1448 -### Updated: Thu Jun 20 14:20:51 SAST 2019 +### Version: V3.2019.06.1449 +### Updated: Thu Jun 20 14:49:39 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf index 60959195e..7ff066d24 100644 --- a/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_testing_changes/bots.d/whitelist-ips.conf @@ -33,4 +33,4 @@ # 111.111.111.111 0; -35.192.85.2 0; +104.154.113.151 0; diff --git a/.dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf index 12e08159a..37d49a796 100644 --- a/.dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_testing_changes/conf.d/globalblacklist.conf @@ -10,8 +10,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1448 -### Updated: Thu Jun 20 14:20:52 SAST 2019 +### Version: V3.2019.06.1449 +### Updated: Thu Jun 20 14:49:40 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_curl_tests/curltest1.txt b/.dev-tools/_curl_tests/curltest1.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests/curltest1.txt +++ b/.dev-tools/_curl_tests/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest2.txt b/.dev-tools/_curl_tests/curltest2.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests/curltest2.txt +++ b/.dev-tools/_curl_tests/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest3.txt b/.dev-tools/_curl_tests/curltest3.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests/curltest3.txt +++ b/.dev-tools/_curl_tests/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest4.txt b/.dev-tools/_curl_tests/curltest4.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests/curltest4.txt +++ b/.dev-tools/_curl_tests/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest5.txt b/.dev-tools/_curl_tests/curltest5.txt index a75c5a987..24a92a7ff 100755 --- a/.dev-tools/_curl_tests/curltest5.txt +++ b/.dev-tools/_curl_tests/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest6.txt b/.dev-tools/_curl_tests_4/curltest6.txt index 865f0c094..cf3e914d6 100755 --- a/.dev-tools/_curl_tests_4/curltest6.txt +++ b/.dev-tools/_curl_tests_4/curltest6.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:58 SAST 2019 +Last Tested: Thu Jun 20 14:50:45 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest7.txt b/.dev-tools/_curl_tests_4/curltest7.txt index 865f0c094..cf3e914d6 100644 --- a/.dev-tools/_curl_tests_4/curltest7.txt +++ b/.dev-tools/_curl_tests_4/curltest7.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:58 SAST 2019 +Last Tested: Thu Jun 20 14:50:45 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest8.txt b/.dev-tools/_curl_tests_4/curltest8.txt index 865f0c094..cf3e914d6 100644 --- a/.dev-tools/_curl_tests_4/curltest8.txt +++ b/.dev-tools/_curl_tests_4/curltest8.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:58 SAST 2019 +Last Tested: Thu Jun 20 14:50:45 SAST 2019 diff --git a/.dev-tools/_curl_tests_changetesting/curltest1.txt b/.dev-tools/_curl_tests_changetesting/curltest1.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest1.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests_changetesting/curltest2.txt b/.dev-tools/_curl_tests_changetesting/curltest2.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest2.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests_changetesting/curltest3.txt b/.dev-tools/_curl_tests_changetesting/curltest3.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest3.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests_changetesting/curltest4.txt b/.dev-tools/_curl_tests_changetesting/curltest4.txt index 0ae77d9a3..86d5c35f6 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest4.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests_changetesting/curltest5.txt b/.dev-tools/_curl_tests_changetesting/curltest5.txt index a75c5a987..24a92a7ff 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest5.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 14:21:04 SAST 2019 +Last Tested: Thu Jun 20 14:49:53 SAST 2019