Restore redirect from http://openstreetmap.org to https://openstreetmap.org

[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..27a1b79b0760b8da0c593cbb831fe0a616eb0599 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>
 
@@ -191,7 +191,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 +223,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
@@ -271,14 +271,14 @@
   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
 
   RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L]
 
   RewriteCond %{REQUEST_URI} !^/server-status$
-  RewriteRule ^(.*)$ https://www.openstreetmap.org$1 [L,NE,R=permanent]
+  RewriteRule ^(.*)$ https://openstreetmap.org$1 [L,NE,R=permanent]
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -290,7 +290,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>