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 7ff066d24..2df0bb4b2 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; -104.154.113.151 0; +35.188.73.34 0; diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index e10064b6b..97c764572 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.1449 -### Updated: Thu Jun 20 14:49:39 SAST 2019 +### Version: V3.2019.06.1450 +### Updated: Thu Jun 20 15:07:42 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test1/nginx.conf b/.dev-tools/_conf_files_test1/nginx.conf new file mode 100644 index 000000000..132f680d1 --- /dev/null +++ b/.dev-tools/_conf_files_test1/nginx.conf @@ -0,0 +1,85 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} 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 ab187abf1..56acef06a 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.192.187.174 0; -35.188.73.34 0; +35.192.136.167 0; +104.154.113.151 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index 62564daf1..235453a7d 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.1449 -### Updated: Thu Jun 20 14:49:39 SAST 2019 +### Version: V3.2019.06.1450 +### Updated: Thu Jun 20 15:07:42 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test2/nginx.conf b/.dev-tools/_conf_files_test2/nginx.conf new file mode 100644 index 000000000..132f680d1 --- /dev/null +++ b/.dev-tools/_conf_files_test2/nginx.conf @@ -0,0 +1,85 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} 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 7ff066d24..2ee725165 100644 --- a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf @@ -33,4 +33,5 @@ # 111.111.111.111 0; -104.154.113.151 0; +35.188.73.34 0; +35.192.136.167 0; diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf index 218fa8202..8db737361 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.1449 -### Updated: Thu Jun 20 14:49:39 SAST 2019 +### Version: V3.2019.06.1450 +### Updated: Thu Jun 20 15:07:42 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test3/nginx.conf b/.dev-tools/_conf_files_test3/nginx.conf new file mode 100644 index 000000000..185518a78 --- /dev/null +++ b/.dev-tools/_conf_files_test3/nginx.conf @@ -0,0 +1,89 @@ +user www-data; + # Bad Bot Blocker + include /etc/nginx/myconf.d/botblocker-nginx-settings.conf; + include /etc/nginx/myconf.d/globalblacklist.conf; + +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} 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 5b84f76ab..f06869713 100644 --- a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf @@ -34,4 +34,3 @@ 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 e10064b6b..97c764572 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.1449 -### Updated: Thu Jun 20 14:49:39 SAST 2019 +### Version: V3.2019.06.1450 +### Updated: Thu Jun 20 15:07:42 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_test4/nginx.conf b/.dev-tools/_conf_files_test4/nginx.conf new file mode 100644 index 000000000..132f680d1 --- /dev/null +++ b/.dev-tools/_conf_files_test4/nginx.conf @@ -0,0 +1,85 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} 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 7ff066d24..2df0bb4b2 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; -104.154.113.151 0; +35.188.73.34 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 37d49a796..d89ff6be6 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.1449 -### Updated: Thu Jun 20 14:49:40 SAST 2019 +### Version: V3.2019.06.1450 +### Updated: Thu Jun 20 15:07:43 SAST 2019 ### Bad Referrer Count: 6693 ### Bad Bot Count: 557 ################################################### diff --git a/.dev-tools/_conf_files_testing_changes/nginx.conf b/.dev-tools/_conf_files_testing_changes/nginx.conf new file mode 100644 index 000000000..132f680d1 --- /dev/null +++ b/.dev-tools/_conf_files_testing_changes/nginx.conf @@ -0,0 +1,85 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} diff --git a/.dev-tools/_curl_tests/curltest1.txt b/.dev-tools/_curl_tests/curltest1.txt index 86d5c35f6..27cf359c4 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:56 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 86d5c35f6..27cf359c4 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:56 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 86d5c35f6..27cf359c4 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:56 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 86d5c35f6..27cf359c4 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:56 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 24a92a7ff..5d7f48d2c 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:56 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest6.txt b/.dev-tools/_curl_tests_4/curltest6.txt index cf3e914d6..2520f1fa4 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:50:45 SAST 2019 +Last Tested: Thu Jun 20 15:08:52 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest7.txt b/.dev-tools/_curl_tests_4/curltest7.txt index cf3e914d6..2520f1fa4 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:50:45 SAST 2019 +Last Tested: Thu Jun 20 15:08:52 SAST 2019 diff --git a/.dev-tools/_curl_tests_4/curltest8.txt b/.dev-tools/_curl_tests_4/curltest8.txt index cf3e914d6..2520f1fa4 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:50:45 SAST 2019 +Last Tested: Thu Jun 20 15:08:52 SAST 2019 diff --git a/.dev-tools/_curl_tests_changetesting/curltest1.txt b/.dev-tools/_curl_tests_changetesting/curltest1.txt index 86d5c35f6..ea217e4b0 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:57 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 86d5c35f6..ea217e4b0 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:57 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 86d5c35f6..ea217e4b0 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:57 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 86d5c35f6..ea217e4b0 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:57 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 24a92a7ff..61042eaf0 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:49:53 SAST 2019 +Last Tested: Thu Jun 20 15:07:57 SAST 2019