imagery: fix delete service action to match create

[chef.git] / cookbooks / web / templates / default / apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 5944e5f18e5f146f3386ba5f8a9a205a3f559588..12beede35b1fead683cdb490f11cf9322e97c6a3 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -95,10 +95,11 @@
   # Set expiry for assets
   #
   <Location /assets/>
   # Set expiry for assets
   #
   <Location /assets/>

-    Header unset ETag
-    FileETag None
+    Header unset Last-Modified
+    FileETag Size

 
     ExpiresDefault "access plus 1 year"
 
     ExpiresDefault "access plus 1 year"

+    Header set Cache-Control "immutable, max-age=31536000"

   </Location>
 
   #
   </Location>
 
   #


@@ -162,18 +163,18 @@
   #
   # Pass some other API calls to the backends via a load balancer
   #
   #
   # Pass some other API calls to the backends via a load balancer
   #

-  ProxyPass /api/0.6/map balancer://backend/api/0.6/map
-  ProxyPass /api/0.6/tracepoints balancer://backend/api/0.6/tracepoints
-  ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read
-  ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://amsterdam$1
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
-  ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes
-  ProxyPass /api/0.6/ways balancer://backend/api/0.6/ways
-  ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations
+  ProxyPassMatch ^(/api/0\.6/map(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/tracepoints)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/amf/read)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/swf/trackpoints)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload(\.json|\.xml)?)$ balancer://amsterdam$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways|relations)(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/nodes(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/ways(\.json|\.xml)?)$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/relations(\.json|\.xml)?)$ balancer://backend$1

   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
 
   #
   ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
 
   #


@@ -193,7 +194,7 @@
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness

-<% node[:web][:backends].each do |backend| -%>
+<% Array(node[:web][:backends]).each do |backend| -%>

     BalancerMember https://<%= backend %> disablereuse=on
 <% end -%>
   </Proxy>
     BalancerMember https://<%= backend %> disablereuse=on
 <% end -%>
   </Proxy>


@@ -290,13 +291,16 @@
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s

-  RewriteRule "^(.*)\.(css|js|svg)" "$1\.$2\.gz" [QSA]
+  RewriteRule "^(.*)\.(css|ico|js|json|svg|xml)$" "$1\.$2\.gz" [QSA]

 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]

+  RewriteRule "\.ico\.gz$"  "-" [T=image/vnd.microsoft.icon,E=no-gzip:1]

   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]

+  RewriteRule "\.json\.gz$"  "-" [T=application/json,E=no-gzip:1]

   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]
   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]

+  RewriteRule "\.xml\.gz$"  "-" [T=application/xml,E=no-gzip:1]

 
 

-  <FilesMatch "(\.js\.gz|\.css\.gz|\.svg\.gz)$">
+  <FilesMatch "\.(css|ico|js|json|svg|xml)\.gz$">

     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>
     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>