From a45efca0dab02f1fe4ba8570ac2410bc39249e27 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Tue, 30 Jul 2019 12:42:15 +0200 Subject: [PATCH] ADD TEST server_names_hash_bucket_size conflict REF: #287 --- .../commented/ubuntu18-hashbucket.conf | 85 +++++++++++++++++++ .dev-tools/test-setupngxblocker.sh | 6 ++ 2 files changed, 91 insertions(+) create mode 100644 .dev-tools/setup-ngxblocker/commented/ubuntu18-hashbucket.conf diff --git a/.dev-tools/setup-ngxblocker/commented/ubuntu18-hashbucket.conf b/.dev-tools/setup-ngxblocker/commented/ubuntu18-hashbucket.conf new file mode 100644 index 000000000..3d1ea73c8 --- /dev/null +++ b/.dev-tools/setup-ngxblocker/commented/ubuntu18-hashbucket.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/test-setupngxblocker.sh b/.dev-tools/test-setupngxblocker.sh index 66c5ccb16..afa0a72c9 100755 --- a/.dev-tools/test-setupngxblocker.sh +++ b/.dev-tools/test-setupngxblocker.sh @@ -74,6 +74,11 @@ sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf.modified } +setup_ubuntu_1804MI3 () { +sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/ubuntu18-hashbucket.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf.modified.hashbucket +sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/ubuntu18.conf.modified.hashbucket +} + setup_ubuntu_1604 () { sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/original/ubuntu16.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/original/ubuntu16.conf.modified sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/original/ubuntu16.conf.modified @@ -156,6 +161,7 @@ sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m setup_ubuntu_1804 setup_ubuntu_1804MI setup_ubuntu_1804MI2 +setup_ubuntu_1804MI3 setup_ubuntu_1604 setup_ubuntu_1604MI setup_ubuntu_1604MI2