Sort ignored addresses

[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..9404ad13ad03e2f6f676fede00989b78087a4957 100644 (file)
--- a/cookbooks/donate/templates/default/apache.erb
+++ b/cookbooks/donate/templates/default/apache.erb
@@ -3,37 +3,29 @@
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>
 
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>
 

-       ServerName donate.openstreetmap.org
+  ServerName donate.openstreetmap.org

   ServerAlias donate.openstreetmap.com
   ServerAlias donate.openstreetmap.net
   ServerAlias donate.openstreetmap.com
   ServerAlias donate.openstreetmap.net

-       ServerAlias donate.osm.org
-  ServerAlias donate.osm.org.za
-  ServerAlias donate.openstreetmap.org.za
-  ServerAlias donate.openstreetmap.org.uk
-  ServerAlias donate.openstreetmap.co.uk
+  ServerAlias donate.osm.org

 
 

-       ServerAdmin webmaster@openstreetmap.org
+  ServerAdmin webmaster@openstreetmap.org

 
 <% if port == 80 -%>
 
 <% if port == 80 -%>

-   # Redirect to secure site
-   Redirect permanent / https://donate.openstreetmap.org
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+  RedirectPermanent / https://donate.openstreetmap.org/

 <% end -%>
 <% if port == 443 -%>
 <% end -%>
 <% if port == 443 -%>

-   #
-   # Enable SSL
-   #
-   SSLEngine on
-
-   # HSTS (mod_headers is required)
-   Header always set Strict-Transport-Security "max-age=300"
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/donate.openstreetmap.org.pem
+  SSLCertificateKeyFile /etc/ssl/private/donate.openstreetmap.org.key

 <% end -%>
 
 <% end -%>
 

-       CustomLog /var/log/apache2/donate.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/donate.openstreetmap.org-error.log
+  CustomLog /var/log/apache2/donate.openstreetmap.org-access.log combined
+  ErrorLog /var/log/apache2/donate.openstreetmap.org-error.log

 
 

-       Options -Indexes
+  Options -Indexes

 
 

-       DocumentRoot /srv/donate.openstreetmap.org
+  DocumentRoot /srv/donate.openstreetmap.org

 
   php_admin_value open_basedir /srv/donate.openstreetmap.org/:/usr/share/php/:/tmp/
   php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
 
   php_admin_value open_basedir /srv/donate.openstreetmap.org/:/usr/share/php/:/tmp/
   php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"


@@ -43,6 +35,9 @@
   Alias /donors.csv /srv/donate.openstreetmap.org/data/donors.csv
 
   # Redirect previous compaigns to homepage
   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/
 
   Redirect permanent /server2013 https://donate.openstreetmap.org/
   Redirect permanent /server2015 https://donate.openstreetmap.org/
 


@@ -68,8 +63,15 @@
 
   # Enable deflate compression on .csv files if possible
   <IfModule mod_deflate.c>
 
   # Enable deflate compression on .csv files if possible
   <IfModule mod_deflate.c>

+    DeflateCompressionLevel 9

     AddOutputFilterByType DEFLATE text/csv
   </IfModule>
     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 -%>
 </VirtualHost>
 
 <% end -%>