nominatim: more directory fixes

[chef.git] / cookbooks / donate / templates / default / apache.erb

diff --git a/cookbooks/donate/templates/default/apache.erb b/cookbooks/donate/templates/default/apache.erb
index 4d6cd5efa76e8327e7493e934a48dc70fc87de57..9529c5a825048d34909fd407ebee57ed073529bc 100644 (file)
--- a/cookbooks/donate/templates/default/apache.erb
+++ b/cookbooks/donate/templates/default/apache.erb
@@ -16,13 +16,16 @@
 
 <% if port == 80 -%>
    # Redirect to secure site
-   Redirect permanent / https://donate.openstreetmap.org
+   Redirect permanent / https://donate.openstreetmap.org/
 <% end -%>
 <% if port == 443 -%>
    #
    # Enable SSL
    #
    SSLEngine on
+   SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
+   SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
+   SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
 
    # HSTS (mod_headers is required)
    Header always set Strict-Transport-Security "max-age=300"
@@ -43,6 +46,9 @@
   Alias /donors.csv /srv/donate.openstreetmap.org/data/donors.csv
 
   # Redirect previous compaigns to homepage
+  Redirect permanent /domain https://donate.openstreetmap.org/
+  Redirect permanent /memorial https://donate.openstreetmap.org/
+  Redirect permanent /server2011 https://donate.openstreetmap.org/
   Redirect permanent /server2013 https://donate.openstreetmap.org/
   Redirect permanent /server2015 https://donate.openstreetmap.org/
 
@@ -70,6 +76,12 @@
   <IfModule mod_deflate.c>
     AddOutputFilterByType DEFLATE text/csv
   </IfModule>
+
+  <IfModule mod_expires.c>
+    ExpiresDefault "access plus 15 minutes"
+    ExpiresByType text/html "access plus 5 minutes"
+    ExpiresByType text/csv "access plus 1 minute"
+  </IfModule>
 </VirtualHost>
 
 <% end -%>