X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..abdeb8abcc779ec996fd57f0fa4978dce4565a8f:/cookbooks/donate/templates/default/apache.erb
diff --git a/cookbooks/donate/templates/default/apache.erb b/cookbooks/donate/templates/default/apache.erb
index 329dc12bd..8cb886e91 100644
--- a/cookbooks/donate/templates/default/apache.erb
+++ b/cookbooks/donate/templates/default/apache.erb
@@ -12,67 +12,19 @@
<% if port == 80 -%>
RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
- RedirectPermanent / https://donate.openstreetmap.org/
+ RedirectPermanent / https://supporting.openstreetmap.org/
<% end -%>
<% if port == 443 -%>
SSLEngine on
SSLCertificateFile /etc/ssl/certs/donate.openstreetmap.org.pem
SSLCertificateKeyFile /etc/ssl/private/donate.openstreetmap.org.key
-<% end -%>
+
+ RedirectMatch . https://supporting.openstreetmap.org/
+ <% end -%>
CustomLog /var/log/apache2/donate.openstreetmap.org-access.log combined
ErrorLog /var/log/apache2/donate.openstreetmap.org-error.log
- Options -Indexes
-
- DocumentRoot /srv/donate.openstreetmap.org
-
- # Alias Dynamic Content to data folder to avoid serving dummy git content
- Alias /donors-eur.csv /srv/donate.openstreetmap.org/data/donors-eur.csv
- 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/
-
-
- Require all granted
-
-
- SetHandler "proxy:unix:/run/php/donate.openstreetmap.org.sock|fcgi://127.0.0.1"
-
-
-
-
- Require all denied
-
-
-
- Require all denied
-
-
-
- Require all denied
-
-
-
- Require all denied
-
-
- # Enable deflate compression on .csv files if possible
-
- DeflateCompressionLevel 9
- AddOutputFilterByType DEFLATE text/csv
-
-
-
- ExpiresDefault "access plus 15 minutes"
- ExpiresByType text/html "access plus 5 minutes"
- ExpiresByType text/csv "access plus 1 minute"
-
<% end -%>