Remove some redundant expiry time rules

[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 6e8ab95ed132f2f53658134c55a7ee7e10e053d5..45683bde272e02a5301a24ab0cf38a8040f6a741 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -62,8 +62,8 @@
   # and force cache headers on response
   #
   <Location /openlayers/img/404.png>
-    Header always set Cache-Control "max-age=31536000"
-    Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+    Header always set Cache-Control "public, max-age=31536000, immutable"
+    Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
     RewriteRule ^ - [G,L]
   </Location>
 
@@ -95,7 +95,6 @@
   # Set expiry for assets
   #
   <Location /assets/>
-    Header unset Last-Modified
     Header unset ETag
     FileETag None
 
@@ -106,7 +105,6 @@
   # Set expiry for attachments
   #
   <Location /attachments/>
-    Header unset Last-Modified
     Header unset ETag
     FileETag None
 
@@ -122,32 +120,9 @@
   <Location /images/>
     ExpiresDefault "access plus 10 years"
   </Location>
-  <Location /javascripts/>
-    ExpiresDefault "access plus 10 years"
-  </Location>
   <Location /openlayers/>
     ExpiresDefault "access plus 7 days"
   </Location>
-  <Location /stylesheets/>
-    ExpiresDefault "access plus 10 years"
-  </Location>
-
-  #
-  # Set expiry for Potlatch 1
-  #
-  <Location /potlatch/>
-    ExpiresDefault "access plus 7 days"
-  </Location>
-
-  #
-  # Set expiry for Potlatch 2
-  #
-  <Location /potlatch2/>
-    ExpiresByType application/x-shockwave-flash "access plus 1 day"
-    ExpiresByType application/xml "access plus 1 day"
-    ExpiresByType text/css "access plus 1 day"
-    ExpiresByType image/png "access plus 7 days"
-  </Location>
 
   #
   # Configure rails
@@ -159,6 +134,7 @@
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails
+  SetEnv OPENSTREETMAP_STATUS <%= @status %>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
@@ -191,7 +167,7 @@
   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://bytemark$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
@@ -223,9 +199,9 @@
   </Proxy>
 
   #
-  # Define a load balancer for the IC backends
+  # Define a load balancer for the Amsterdam backends
   #
-  <Proxy balancer://ams>
+  <Proxy balancer://amsterdam>
     ProxySet lbmethod=bybusyness
 <% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
     BalancerMember https://<%= backend %> disablereuse=on
@@ -268,10 +244,24 @@
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
+
+  Header always set Cache-Control "max-age=31536000"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
+
+  RewriteEngine on
+
+  RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
+
+  RewriteCond %{REQUEST_URI} !^/server-status$
+  RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
+</VirtualHost>
+
+<VirtualHost *:80>
+  ServerName www.openstreetmap.org
   ServerAlias *
 
   Header always set Cache-Control "max-age=31536000"
-  Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
 
   RewriteEngine on
 
@@ -290,7 +280,7 @@
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 
   Header always set Cache-Control "max-age=31536000"
-  Header always set Expires "Tue, 19 Jan 2038 03:14:08 GMT"
+  Header always set Expires "Tue, 19 Jan 2038 03:14:07 GMT"
 
   RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>