Remove forced downgrade of hp-health

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

diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index dddd5de9fdfe55bdbc1bf985263e5eeda39ea4c0..8790c80328d18d463299542c5545f61ac127dadb 100644 (file)
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -5,9 +5,13 @@
         ServerName planet.openstreetmap.org
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
         ServerName planet.openstreetmap.org
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org

-<% if port == 443 -%>

 
 

+<% if port == 443 -%>

         SSLEngine on
         SSLEngine on

+        SSLCertificateFile /etc/ssl/certs/planet.openstreetmap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/planet.openstreetmap.org.key
+<% else -%>
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

 <% end -%>
 
         CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
 <% end -%>
 
         CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined


@@ -30,8 +34,7 @@
         ProxyPass /replication/streaming http://127.0.0.1:8080
 
         <Location /replication/steaming>
         ProxyPass /replication/streaming http://127.0.0.1:8080
 
         <Location /replication/steaming>

-                Order deny,allow
-                Allow from all
+                Require all granted

         </Location>
 
         Redirect /pbf-experimental/    /pbf/
         </Location>
 
         Redirect /pbf-experimental/    /pbf/