X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/52722858a6bccd05484db3af0bc7580f01e5d1b1..4bfd3b66e6fc725fb406068a955bb3aeea394f90:/cookbooks/tile/templates/default/apache.erb diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 9199cb3a9..24b87902b 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -26,6 +26,10 @@ ErrorLog /var/log/apache2/error.log BufferedLogs on + # 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 RewriteEngine on @@ -43,13 +47,21 @@ Options None AllowOverride None +<% if node[:lsb][:release].to_f >= 14.04 -%> + Require all granted +<% else -%> Order allow,deny Allow from all +<% end -%> Options ExecCGI AllowOverride None +<% if node[:lsb][:release].to_f >= 14.04 -%> + Require all granted +<% else -%> Order allow,deny Allow from all +<% end -%>