X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/abdeb8abcc779ec996fd57f0fa4978dce4565a8f..12c1bfbf869c93d0da2999b70f556b39ff71de17:/cookbooks/civicrm/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/civicrm/templates/default/apache.erb b/cookbooks/civicrm/templates/default/apache.erb index dd6112f12..7f45c976d 100644 --- a/cookbooks/civicrm/templates/default/apache.erb +++ b/cookbooks/civicrm/templates/default/apache.erb @@ -13,19 +13,20 @@ ServerAdmin webmaster@openstreetmap.org + RewriteEngine on + <% if port == 80 -%> - RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ - RedirectPermanent / https://supporting.openstreetmap.org/ + RewriteRule ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 [R=permanent,L] <% end -%> <% if port == 443 -%> SSLEngine on SSLCertificateFile /etc/ssl/certs/join.osmfoundation.org.pem SSLCertificateKeyFile /etc/ssl/private/join.osmfoundation.org.key +<% end -%> - RedirectMatch . https://supporting.openstreetmap.org/ - <% end -%> + RewriteRule ^/(.*)$ https://supporting.openstreetmap.org/$1 [R=307,L] - CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined + CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined_extended ErrorLog /var/log/apache2/join.osmfoundation.org-error.log