nominatim: ruby packages needed for prometheus

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

diff --git a/cookbooks/civicrm/templates/default/apache.erb b/cookbooks/civicrm/templates/default/apache.erb
index dd6112f121916cb7ebe5441c15e2c69c1fd6a85a..7f45c976d3e921d51bbb2899fd8d506034e9df6f 100644 (file)
--- 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
 
 </VirtualHost>