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..cf106db23 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; +35.202.145.110 0; diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index 37883d299..4048476bc 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.1443 -### Updated: Thu Jun 20 13:08:27 SAST 2019 +### Version: V3.2019.06.1444 +### Updated: Thu Jun 20 13:22:10 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### 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 c19846de4..eefcdab18 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; -104.154.120.187 0; +35.202.145.110 0; +35.188.1.99 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index d13f8fff6..d365cec10 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.1443 -### Updated: Thu Jun 20 13:08:27 SAST 2019 +### Version: V3.2019.06.1444 +### Updated: Thu Jun 20 13:22:10 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### 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 e181394c9..6f85b876a 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.188.1.99 0; -35.184.226.236 0; +104.154.120.187 0; diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf index f70e0fd83..d6424cf34 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.1443 -### Updated: Thu Jun 20 13:08:27 SAST 2019 +### Version: V3.2019.06.1444 +### Updated: Thu Jun 20 13:22:10 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### 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 9176a1bf0..7cc3fe599 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.226.236 0; -35.193.7.13 0; +104.154.120.187 0; +35.192.85.2 0; diff --git a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf index 37883d299..4048476bc 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.1443 -### Updated: Thu Jun 20 13:08:27 SAST 2019 +### Version: V3.2019.06.1444 +### Updated: Thu Jun 20 13:22:10 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 9176a1bf0..cf106db23 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,5 +33,4 @@ # 111.111.111.111 0; -35.184.226.236 0; -35.193.7.13 0; +35.202.145.110 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 826ec4d1f..570d6d5a1 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.1443 -### Updated: Thu Jun 20 13:08:28 SAST 2019 +### Version: V3.2019.06.1444 +### Updated: Thu Jun 20 13:22:11 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_testing_changes/default.vhost b/.dev-tools/_conf_files_testing_changes/default.vhost index a6dcd7f9c..34ed06fd0 100644 --- a/.dev-tools/_conf_files_testing_changes/default.vhost +++ b/.dev-tools/_conf_files_testing_changes/default.vhost @@ -1,13 +1,15 @@ server { - listen *:9000; + # 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; - index index.html; - - # Bad Bot Blocker - include /etc/nginx/bots.d/ddos.conf; - include /etc/nginx/bots.d/blockbots.conf; + location / { + root /var/www/html/; + } } diff --git a/.dev-tools/_curl_tests/curltest1.txt b/.dev-tools/_curl_tests/curltest1.txt index 4568ef9a9..d3c68a69e 100755 --- a/.dev-tools/_curl_tests/curltest1.txt +++ b/.dev-tools/_curl_tests/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 13:08:40 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 4568ef9a9..d3c68a69e 100755 --- a/.dev-tools/_curl_tests/curltest2.txt +++ b/.dev-tools/_curl_tests/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 13:08:40 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 4568ef9a9..d3c68a69e 100755 --- a/.dev-tools/_curl_tests/curltest3.txt +++ b/.dev-tools/_curl_tests/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 13:08:40 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 4568ef9a9..d3c68a69e 100755 --- a/.dev-tools/_curl_tests/curltest4.txt +++ b/.dev-tools/_curl_tests/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 13:08:40 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 0ab67f547..fbf4cfd35 100755 --- a/.dev-tools/_curl_tests/curltest5.txt +++ b/.dev-tools/_curl_tests/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jun 20 13:08:40 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest6.txt b/.dev-tools/_curl_tests_4/curltest6.txt index 847b6ddcc..8973f4a5a 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 13:09:32 SAST 2019 +Last Tested: Thu Jun 20 13:23:17 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest7.txt b/.dev-tools/_curl_tests_4/curltest7.txt index 847b6ddcc..8973f4a5a 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 13:09:32 SAST 2019 +Last Tested: Thu Jun 20 13:23:17 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest8.txt b/.dev-tools/_curl_tests_4/curltest8.txt index 847b6ddcc..8973f4a5a 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 13:09:32 SAST 2019 +Last Tested: Thu Jun 20 13:23:17 SAST 2019 diff --git a/.dev-tools/_curl_tests_changetesting/curltest1.txt b/.dev-tools/_curl_tests_changetesting/curltest1.txt index e14a0ac61..d3c68a69e 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 13:09:35 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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/curltest10.txt b/.dev-tools/_curl_tests_changetesting/curltest10.txt index 0d6b76419..00fc93080 100644 --- a/.dev-tools/_curl_tests_changetesting/curltest10.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest10.txt @@ -1,5 +1,5 @@ -Last Tested: Thu Jun 20 12:31:17 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 SAST 2019 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 153 100 153 0 0 29468 0 --:--:-- --:--:-- --:--:-- 30600 + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 169 100 169 0 0 157k 0 --:--:-- --:--:-- --:--:-- 165k diff --git a/.dev-tools/_curl_tests_changetesting/curltest2.txt b/.dev-tools/_curl_tests_changetesting/curltest2.txt index e14a0ac61..d3c68a69e 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 13:09:35 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 e14a0ac61..d3c68a69e 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 13:09:35 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 e14a0ac61..d3c68a69e 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 13:09:35 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 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 74c6c842f..4cc0147db 100755 --- a/.dev-tools/_curl_tests_changetesting/curltest5.txt +++ b/.dev-tools/_curl_tests_changetesting/curltest5.txt @@ -1,13 +1,9 @@ -Last Tested: Thu Jun 20 13:09:35 SAST 2019 +Last Tested: Thu Jun 20 13:22:23 SAST 2019 - - -
-This is merely used for testing !!!
- - \ No newline at end of file + +This is merely used for testing !!!
- - \ No newline at end of file + +This is merely used for testing !!!
- - \ No newline at end of file + +This is merely used for testing !!!
- - \ No newline at end of file + +