Merge remote-tracking branch 'github/pull/183'

[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 8790c80328d18d463299542c5545f61ac127dadb..a8a761a879808f4e7ecddc5c8732165a6f7acad9 100644 (file)
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -1,21 +1,16 @@
 # DO NOT EDIT - This file is being maintained by Chef
 # DO NOT EDIT - This file is being maintained by Chef

-<% [80, 443].each do |port| -%>

    
    

-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>

         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 -%>
+        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
+

         SSLEngine on
         SSLCertificateFile /etc/ssl/certs/planet.openstreetmap.org.pem
         SSLCertificateKeyFile /etc/ssl/private/planet.openstreetmap.org.key
         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
-        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log

 
         DocumentRoot /store/planet
 
 
         DocumentRoot /store/planet
 


@@ -63,4 +58,15 @@
 
         RewriteRule     ^(/planet/planet\-latest\.osm\.bz2)$    ${latestplanet:$1}      [R,L]
 </VirtualHost>
 
         RewriteRule     ^(/planet/planet\-latest\.osm\.bz2)$    ${latestplanet:$1}      [R,L]
 </VirtualHost>

-<% end -%>
+
+<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
+
+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+        RedirectPermanent / https://planet.openstreetmap.org/
+</VirtualHost>