V4.2019.07.1747 [ci skip]

mitchellkrogza · Jul 4, 2019 · 21d4eca · 21d4eca
1 parent 35c982c
commit 21d4eca
Show file tree

Hide file tree

Showing 61 changed files with 1,179 additions and 1,186 deletions.
diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1746
-### Updated: Thu Jul  4 09:09:17 SAST 2019
+### Version: V3.2019.07.1747
+### Updated: Thu Jul  4 09:38:26 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1746
-### Updated: Thu Jul  4 09:09:17 SAST 2019
+### Version: V3.2019.07.1747
+### Updated: Thu Jul  4 09:38:26 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1746
-### Updated: Thu Jul  4 09:09:17 SAST 2019
+### Version: V3.2019.07.1747
+### Updated: Thu Jul  4 09:38:26 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1746
-### Updated: Thu Jul  4 09:09:17 SAST 2019
+### Version: V3.2019.07.1747
+### Updated: Thu Jul  4 09:38:26 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1746
-### Updated: Thu Jul  4 09:09:17 SAST 2019
+### Version: V3.2019.07.1747
+### Updated: Thu Jul  4 09:38:26 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1746
-### Updated: Thu Jul  4 09:09:16 SAST 2019
+### Version: V4.2019.07.1747
+### Updated: Thu Jul  4 09:38:25 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################

diff --git a/.dev-tools/setup-ngxblocker/commented/arch.conf.modified b/.dev-tools/setup-ngxblocker/commented/arch.conf.modified
@@ -1,13 +1,4 @@
 
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #user html;
 worker_processes  1;
 
@@ -35,6 +26,15 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 
     #keepalive_timeout  0;
     keepalive_timeout  65;

diff --git a/.dev-tools/setup-ngxblocker/commented/fedora.conf.modified b/.dev-tools/setup-ngxblocker/commented/fedora.conf.modified
@@ -1,13 +1,4 @@
 # For more information on configuration, see:
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #   * Official English Documentation: http://nginx.org/en/docs/
 #   * Official Russian Documentation: http://nginx.org/ru/docs/
 
@@ -32,6 +23,15 @@ http {
 
     sendfile            on;
     tcp_nopush          on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
     tcp_nodelay         on;
     keepalive_timeout   65;
     types_hash_max_size 2048;

diff --git a/.dev-tools/setup-ngxblocker/commented/opensuse.conf.modified b/.dev-tools/setup-ngxblocker/commented/opensuse.conf.modified
@@ -1,13 +1,4 @@
 
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #user  nginx;
 worker_processes  1;
 
@@ -47,6 +38,15 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 
     #keepalive_timeout  0;
     keepalive_timeout  65;

diff --git a/.dev-tools/setup-ngxblocker/commented/ubuntu16.conf.modified b/.dev-tools/setup-ngxblocker/commented/ubuntu16.conf.modified
@@ -1,13 +1,4 @@
 user www-data;
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 worker_processes auto;
 pid /run/nginx.pid;
 
@@ -24,6 +15,15 @@ http {
 
 	sendfile on;
 	tcp_nopush on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;

diff --git a/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf.modified b/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf.modified
@@ -1,13 +1,4 @@
 user www-data;
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 worker_processes auto;
 pid /run/nginx.pid;
 include /etc/nginx/modules-enabled/*.conf;
@@ -25,6 +16,15 @@ http {
 
 	sendfile on;
 	tcp_nopush on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;

diff --git a/.dev-tools/setup-ngxblocker/modified/arch.conf.modified b/.dev-tools/setup-ngxblocker/modified/arch.conf.modified
@@ -1,13 +1,4 @@
 
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #user html;
 worker_processes  1;
 
@@ -35,6 +26,15 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 
     #keepalive_timeout  0;
     keepalive_timeout  65;

diff --git a/.dev-tools/setup-ngxblocker/modified/centos.conf.modified b/.dev-tools/setup-ngxblocker/modified/centos.conf.modified
@@ -1,13 +1,4 @@
 # For more information on configuration, see:
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #   * Official English Documentation: http://nginx.org/en/docs/
 #   * Official Russian Documentation: http://nginx.org/ru/docs/
 
@@ -32,6 +23,15 @@ http {
 
     sendfile            on;
     tcp_nopush          on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
     tcp_nodelay         on;
     keepalive_timeout   65;
     types_hash_max_size 2048;

diff --git a/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified b/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified
@@ -1,13 +1,4 @@
 # For more information on configuration, see:
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #   * Official English Documentation: http://nginx.org/en/docs/
 #   * Official Russian Documentation: http://nginx.org/ru/docs/
 
@@ -32,6 +23,15 @@ http {
 
     sendfile            on;
     tcp_nopush          on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
     tcp_nodelay         on;
     keepalive_timeout   65;
     types_hash_max_size 2048;

diff --git a/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified b/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified
@@ -1,13 +1,4 @@
 
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 #user  nginx;
 worker_processes  1;
 
@@ -47,6 +38,15 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 
     #keepalive_timeout  0;
     keepalive_timeout  65;

diff --git a/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified b/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified
@@ -1,13 +1,4 @@
 user www-data;
-
-
-    ##
-    # Nginx Bad Bot Blocker Includes
-    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-    ##
-	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
- 	include /etc/nginx/conf.d/globalblacklist.conf;
-
 worker_processes auto;
 pid /run/nginx.pid;
 
@@ -24,6 +15,15 @@ http {
 
 	sendfile on;
 	tcp_nopush on;
+
+
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
+	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /etc/nginx/conf.d/globalblacklist.conf;
+
 	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;