X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5d7a8f818d35fc59408204ff7ca10c5eef541569..926b39e016afc77a6b8ea32c37273c7a6fca5467:/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb?ds=sidebyside

diff --git a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
index 63d5e14f4..60059837b 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
@@ -1,16 +1,19 @@
 server {
-    listen       443 ssl;
+    listen       443 ssl spdy;
     server_name  localhost;
 
-    ssl_certificate      /etc/ssl/certs/tile.openstreetmap.pem;
-    ssl_certificate_key  /etc/ssl/private/tile.openstreetmap.key;
+    proxy_buffers 8 64k;
 
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!AESGCM;
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache shared:SSL:10m;
-    ssl_session_timeout 10m;
+    ssl_certificate      /etc/ssl/certs/<%= @certificate %>.pem;
+    ssl_certificate_key  /etc/ssl/private/<%= @certificate %>.key;
 
-    location / { proxy_pass http://127.0.0.1; }
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 SSLv3;
+    ssl_ciphers aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:30m;
+    ssl_session_timeout 15m;
+    ssl_stapling on;
+    resolver <%= @resolvers.join(" ") %>;
 
+    location / { proxy_pass http://127.0.0.1; proxy_set_header X-Forwarded-For $remote_addr; }
 }