From: Grant Slater <git@firefishy.com>
Date: Fri, 22 Nov 2019 15:45:10 +0000 (+0000)
Subject: Revert "tilecache: restrict cache control headers to osm.org only"
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b843df81981adadc90d0ee9a75e9da1d311b2c57

Revert "tilecache: restrict cache control headers to osm.org only"

This reverts commit 672db0ffdbfdec5510c282e7eeb2adc30d535111.
---

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 0b77171e8..47d3bd372 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -73,11 +73,6 @@ map $http_referer $denied_referer {
   'http://osm.org'                 1; # Faked
 }
 
-map $http_referer $osm_referer {
-  default                                 0;     # False
-  '~^https:\/\/www\.openstreetmap\.org\/' 'osm'; # True
-}
-
 # Limit Cache-Control header to only approved User-Agents
 map $http_user_agent $limit_http_cache_control {
   default '';                              # Unset Header
@@ -254,20 +249,12 @@ server {
         return 418;
       }
 
-      # Only allow cache purges if from OpenStreetMap referer
-      if ($osm_referer) {
-        # Allow cache purging headers only from select User-Agents (uses nginx Map)
-        proxy_set_header Cache-Control $limit_http_cache_control;
-        proxy_set_header Pragma $limit_http_pragma;
-      }
-      # nginx has no if else logic
-      if ($osm_referer != 'osm') {
-        proxy_set_header Cache-Control '';
-        proxy_set_header Pragma '';
-      }
-
       # Strip any ?query parameters from urls
       set $args '';
+
+      # Allow cache purging headers only from select User-Agents (uses nginx Map)
+      proxy_set_header Cache-Control $limit_http_cache_control;
+      proxy_set_header Pragma $limit_http_pragma;
     }
 <% end %>
 }