X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/351d2fd5232c53acece585da47cc98b17758ece1..31a5167:/cookbooks/planet/templates/default/apache.erb

diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index ef2834fd8..dd2c824e1 100644
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -1,10 +1,14 @@
 # DO NOT EDIT - This file is being maintained by Chef
-
-<VirtualHost *:80>
+   
+<VirtualHost *:443>
         ServerName planet.openstreetmap.org
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
+        SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/planet.openstreetmap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/planet.openstreetmap.org.key
+
         CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
         ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
@@ -25,8 +29,7 @@
         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/
@@ -46,25 +49,24 @@
         RewriteCond	%{REMOTE_ADDR}  ^193\.1\.193\.64	[OR]
         RewriteCond     %{REMOTE_ADDR}  ^146\.169\.             [OR]
         RewriteCond     %{REMOTE_ADDR}  ^129\.31\.              [OR]
-	RewriteCond	%{REMOTE_ADDR}  ^193\.60\.              [OR]
-	RewriteCond     %{REMOTE_ADDR}  ^193\.61\.              [OR]
-	RewriteCond     %{REMOTE_ADDR}  ^193\.62\.              [OR]
-	RewriteCond     %{REMOTE_ADDR}  ^193\.63\.              [OR]
+        RewriteCond	%{REMOTE_ADDR}  ^193\.60\.              [OR]
+        RewriteCond     %{REMOTE_ADDR}  ^193\.61\.              [OR]
+        RewriteCond     %{REMOTE_ADDR}  ^193\.62\.              [OR]
+        RewriteCond     %{REMOTE_ADDR}  ^193\.63\.              [OR]
         RewriteCond	%{QUERY_STRING} nomirror
         RewriteRule	.*      - [L]
 
         RewriteRule     ^(/planet/planet\-latest\.osm\.bz2)$    ${latestplanet:$1}      [R,L]
 </VirtualHost>
 
-<VirtualHost *:443>
-        ServerName planet.openstreetmap.org
-        ServerAlias planet.osm.org
-        ServerAdmin webmaster@openstreetmap.org
-
-        SSLEngine on
+<VirtualHost *:80>
+	ServerName planet.openstreetmap.org
+	ServerAlias planet.osm.org
+	ServerAdmin webmaster@openstreetmap.org
 
-        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
-        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
+	CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+	ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
-        Redirect / http://planet.openstreetmap.org/
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://planet.openstreetmap.org/
 </VirtualHost>