nominatim: temporarily disable cleanup of WAL archive

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

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 4fdb67b8d9f9093e78415aa4deb503f62ac6d7dd..24b87902bca4ca8845e64767fe71186d2454c388 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -26,7 +26,8 @@
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 

-  # Set Access-Control-Allow-Origin header to allow Cross-origin resource sharing (CORS)
+  # Always set Access-Control-Allow-Origin so that simple CORS requests
+  # will always work and can be cached

   Header set Access-Control-Allow-Origin "*"
 
   # Enable the rewrite engine
   Header set Access-Control-Allow-Origin "*"
 
   # Enable the rewrite engine


@@ -46,13 +47,21 @@
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>

   Order allow,deny
   Allow from all
   Order allow,deny
   Allow from all

+<% end -%>

 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None
 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>

   Order allow,deny
   Allow from all
   Order allow,deny
   Allow from all

+<% end -%>

 </Directory>
 </Directory>