Fix typo in planet-mirror-redirect-update

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

-
-<VirtualHost *:80>
+<% [80, 443].each do |port| -%>
+   
+<VirtualHost *:<%= port %>>

         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 -%>
+
+        SSLEngine on
+<% end -%>

 
         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


@@ -19,6 +24,7 @@
                 IndexOrderDefault Descending Date
                 AddType text/html .cgi
                 AddHandler cgi-script .cgi
                 IndexOrderDefault Descending Date
                 AddType text/html .cgi
                 AddHandler cgi-script .cgi

+                Require all granted

         </Directory>
 
         ProxyPass /replication/streaming http://127.0.0.1:8080
         </Directory>
 
         ProxyPass /replication/streaming http://127.0.0.1:8080


@@ -45,25 +51,13 @@
         RewriteCond    %{REMOTE_ADDR}  ^193\.1\.193\.64        [OR]
         RewriteCond     %{REMOTE_ADDR}  ^146\.169\.             [OR]
         RewriteCond     %{REMOTE_ADDR}  ^129\.31\.              [OR]
         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>
         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
-
-        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
-        ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
-
-        Redirect / http://planet.openstreetmap.org/
-</VirtualHost>
+<% end -%>