]> git.openstreetmap.org Git - chef.git/commitdiff
Imagery - nginx performance fixes
authorGrant Slater <git@firefishy.com>
Sun, 31 Jan 2016 23:39:35 +0000 (23:39 +0000)
committerGrant Slater <git@firefishy.com>
Sun, 31 Jan 2016 23:39:35 +0000 (23:39 +0000)
cookbooks/imagery/templates/default/nginx_imagery.conf.erb
cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb

index 30bcd0740abb9fa456f721534842a840be0d514a..42994a6fca9f5c87797f35ebdd6f67eb61b82761 100644 (file)
@@ -2,6 +2,21 @@ server {
     listen       80;
     server_name  <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %><%- end -%>;
 
+    root "/srv/<%= @name %>";
+
+    gzip on;
+    gzip_disable "msie6";
+    # text/html is implicit
+    gzip_types text/plain text/css application/json application/javascript application/x-javascript text/javascript text/xml application/xml application/rss+xml application/atom+xml application/rdf+xml image/svg+xml;
+    gzip_min_length 1024;
+    gzip_http_version 1.0;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_vary on;
+
+    sendfile   on;
+    tcp_nopush on;
+
     # Include site imagery layers
     include /srv/imagery/nginx/<%= @name %>/layer-*.conf;
 }
index 041870b6a1621a20be0a4cfefcaeef41279c7f8e..2e75717b0f18eb85dd35890d007e41c6bd2cd867 100644 (file)
@@ -4,6 +4,7 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   # Override QUERY_STRING to force mapserver query parameters
   fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
   fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @layer %>.socket";
+  fastcgi_buffers 8 64k;
   include fastcgi_params;
 
   gzip off;