civi version bump

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

diff --git a/cookbooks/overpass/templates/default/apache.erb b/cookbooks/overpass/templates/default/apache.erb
index 47e1363813592d994d51f03fd2bf48a30e33ae65..8ccd28a9d3eae34cfe2e2eabcca8614a03073144 100644 (file)
--- a/cookbooks/overpass/templates/default/apache.erb
+++ b/cookbooks/overpass/templates/default/apache.erb
@@ -29,9 +29,10 @@
 
         DocumentRoot <%= @directory %>
 
 
         DocumentRoot <%= @directory %>
 

+        RewriteEngine on

         RewriteMap totp prg:/srv/query.openstreetmap.org/apache/totp-filter
         RewriteCond ${totp:%{HTTP_COOKIE}} =0
         RewriteMap totp prg:/srv/query.openstreetmap.org/apache/totp-filter
         RewriteCond ${totp:%{HTTP_COOKIE}} =0

-        RewriteRule ^.*$ - [F,L]
+        RewriteRule ^/query-features - [F,L]

 
 <% if node[:overpass][:restricted_api] -%>
         ScriptAlias /query-features <%= @script_directory %>/interpreter
 
 <% if node[:overpass][:restricted_api] -%>
         ScriptAlias /query-features <%= @script_directory %>/interpreter


@@ -39,6 +40,7 @@
         # Remove Origin so Overpass does not interfere.
         RequestHeader unset Origin
         Header always add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
         # Remove Origin so Overpass does not interfere.
         RequestHeader unset Origin
         Header always add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin

+        Header always add Access-Control-Allow-Credentials true

 <% else -%>
         ScriptAlias /api/ <%= @script_directory %>/
 <% end -%>
 <% else -%>
         ScriptAlias /api/ <%= @script_directory %>/
 <% end -%>