X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7cea99ce44b5647f474c4fd380ca9c2462d5d398..8f6bf8b7cd2909565909a6f817426a3f6c8c0d80:/cookbooks/nginx/templates/default/nginx.conf.erb

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index 429716d04..e5969ce45 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -18,6 +18,7 @@ http {
     default_type  application/octet-stream;
 
     server_names_hash_bucket_size 128;
+    map_hash_bucket_size 128;
 
 <% if node[:nginx][:access_log] -%>
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
@@ -29,16 +30,22 @@ http {
     access_log  off;
 <% end -%>
 
-    keepalive_timeout  65;
+    keepalive_timeout  30;
 
     server_tokens off;
 
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers <%= node[:ssl][:ciphers] -%>;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers <%= node[:ssl][:openssl_ciphers] -%>;
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:50m;
     ssl_session_timeout 30m;
+
     ssl_stapling on;
+
+    # Validate the stapling response is signed by a trusted certificate
+    ssl_stapling_verify on;
+    ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
+
     ssl_dhparam /etc/ssl/certs/dhparam.pem;
     resolver <%= @resolvers.join(" ") %>;
     resolver_timeout 5s;