From a06a4a201a8ad619c9de715c19bf4b58b9356f62 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 28 Jun 2017 16:39:13 +0200 Subject: [PATCH] Revert "V3.2017.06.626 [ci skip]" This reverts commit cbd3d3ef5db5e5e17b50e97a9f969b20fbdfeaa7. --- AUTO-CONFIGURATION.md | 2 +- MANUAL-CONFIGURATION.md | 2 +- README.md | 2 +- .../etc/nginx/conf.d/globalblacklist.conf | 12 +----------- conf.d/globalblacklist.conf | 12 +----------- robots.txt/robots.txt | 4 ++-- travisCI/globalblacklist.template | 12 +----------- 7 files changed, 8 insertions(+), 38 deletions(-) diff --git a/AUTO-CONFIGURATION.md b/AUTO-CONFIGURATION.md index ee5e58d03..2e03d5f49 100755 --- a/AUTO-CONFIGURATION.md +++ b/AUTO-CONFIGURATION.md @@ -7,7 +7,7 @@ ##### Version Information # ##### Versio I formatio # ******************************************** -#### Version: V3.2017.06.626 +#### Version: V3.2017.06.625 #### Bad Referrer Count: 4948 #### Bad Bot Count: 480 ******************************************** diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md index fcf6b554a..0e7c1f6cf 100755 --- a/MANUAL-CONFIGURATION.md +++ b/MANUAL-CONFIGURATION.md @@ -7,7 +7,7 @@ ##### Version Information # ##### Versio I formatio # ******************************************** -#### Version: V3.2017.06.626 +#### Version: V3.2017.06.625 #### Bad Referrer Count: 4948 #### Bad Bot Count: 480 ******************************************** diff --git a/README.md b/README.md index 1dea2d850..df69e2a6d 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ##### Version Information # ##### Versio I formatio # ******************************************** -#### Version: V3.2017.06.626 +#### Version: V3.2017.06.625 #### Bad Referrer Count: 4948 #### Bad Bot Count: 480 ******************************************** diff --git a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf index 38f8e555b..be863f641 100755 --- a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf +++ b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf @@ -4,7 +4,7 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.06.626 +### Version: V3.2017.06.625 ### VERSION INFORMATION ## ### This file implements a checklist / blacklist for good user agents, bad user agents and @@ -134,7 +134,6 @@ map $http_user_agent $bad_bot { # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************** # User-Agent Strings Allowed Throug but Rate Limited @@ -146,7 +145,6 @@ map $http_user_agent $bad_bot { # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************************** # Rate Limited User-Agents who get a bit aggressive on bandwidth @@ -156,7 +154,6 @@ map $http_user_agent $bad_bot { # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ********************************************* # Bad User-Agent Strings That We Block Outright @@ -168,7 +165,6 @@ map $http_user_agent $bad_bot { # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -322,7 +318,6 @@ map $http_referer $bad_referer { # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -381,7 +376,6 @@ geo $validate_client { # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ********* # Bing Bots @@ -391,13 +385,11 @@ geo $validate_client { # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ************************* # Wordpress Theme Detectors @@ -407,7 +399,6 @@ geo $validate_client { # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### -# END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # **************************************** # NIBBLER - SEO testing and reporting tool @@ -418,7 +409,6 @@ geo $validate_client { # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### -# END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # **************************** diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf index 38f8e555b..be863f641 100644 --- a/conf.d/globalblacklist.conf +++ b/conf.d/globalblacklist.conf @@ -4,7 +4,7 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.06.626 +### Version: V3.2017.06.625 ### VERSION INFORMATION ## ### This file implements a checklist / blacklist for good user agents, bad user agents and @@ -134,7 +134,6 @@ map $http_user_agent $bad_bot { # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************** # User-Agent Strings Allowed Throug but Rate Limited @@ -146,7 +145,6 @@ map $http_user_agent $bad_bot { # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************************** # Rate Limited User-Agents who get a bit aggressive on bandwidth @@ -156,7 +154,6 @@ map $http_user_agent $bad_bot { # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ********************************************* # Bad User-Agent Strings That We Block Outright @@ -168,7 +165,6 @@ map $http_user_agent $bad_bot { # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -322,7 +318,6 @@ map $http_referer $bad_referer { # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -381,7 +376,6 @@ geo $validate_client { # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ********* # Bing Bots @@ -391,13 +385,11 @@ geo $validate_client { # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ************************* # Wordpress Theme Detectors @@ -407,7 +399,6 @@ geo $validate_client { # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### -# END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # **************************************** # NIBBLER - SEO testing and reporting tool @@ -418,7 +409,6 @@ geo $validate_client { # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### -# END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # **************************** diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt index 5d7457b7c..8bead60a4 100644 --- a/robots.txt/robots.txt +++ b/robots.txt/robots.txt @@ -1,7 +1,7 @@ ### Version Information # ################################################### -### Version: V3.2017.06.626 -### Updated: Wed Jun 28 15:47:25 SAST 2017 +### Version: V3.2017.06.625 +### Updated: Wed Jun 28 15:35:22 SAST 2017 ### Bad Referrer Count: 4948 ### Bad Bot Count: 480 ################################################### diff --git a/travisCI/globalblacklist.template b/travisCI/globalblacklist.template index 38f8e555b..be863f641 100755 --- a/travisCI/globalblacklist.template +++ b/travisCI/globalblacklist.template @@ -4,7 +4,7 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.06.626 +### Version: V3.2017.06.625 ### VERSION INFORMATION ## ### This file implements a checklist / blacklist for good user agents, bad user agents and @@ -134,7 +134,6 @@ map $http_user_agent $bad_bot { # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************** # User-Agent Strings Allowed Throug but Rate Limited @@ -146,7 +145,6 @@ map $http_user_agent $bad_bot { # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END ALLOWED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ************************************************************** # Rate Limited User-Agents who get a bit aggressive on bandwidth @@ -156,7 +154,6 @@ map $http_user_agent $bad_bot { # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END LIMITED BOTS ### DO NOT EDIT THIS LINE AT ALL ### # ********************************************* # Bad User-Agent Strings That We Block Outright @@ -168,7 +165,6 @@ map $http_user_agent $bad_bot { # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -322,7 +318,6 @@ map $http_referer $bad_referer { # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### # END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### -# END BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -381,7 +376,6 @@ geo $validate_client { # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END GOOGLE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ********* # Bing Bots @@ -391,13 +385,11 @@ geo $validate_client { # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END BING IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # ************************* # Wordpress Theme Detectors @@ -407,7 +399,6 @@ geo $validate_client { # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### -# END WP THEME DETECTORS ### DO NOT EDIT THIS LINE AT ALL ### # **************************************** # NIBBLER - SEO testing and reporting tool @@ -418,7 +409,6 @@ geo $validate_client { # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### -# END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ### # ****************************