Merge remote-tracking branch 'github/pull/396'

[chef.git] / cookbooks / tilecache / templates / default / nginx_tile.conf.erb

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 1965de764c48040e5be49c822163713c96a56091..338e0d51d01889acfaf2f9877e9772c53a359de5 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -154,6 +154,14 @@ map $http_referer $denied_referer {
   '~^https?://[^.]*\.cellmapper\.net/'   1;
 }
 
   '~^https?://[^.]*\.cellmapper\.net/'   1;
 }
 

+map $http_referer $censored_referer {
+  default                                 0; # Not denied
+  # Blocked on board instructions
+  '~^https?://schiebt-sie-ab\.de/'        1;
+  '~^https?://[^.]*\.schiebt-sie-ab\.de/' 1;
+}
+
+

 map $http_referer $osm_referer {
   default                                 '';    # False
   '~^https:\/\/www\.openstreetmap\.org\/' 'osm'; # True
 map $http_referer $osm_referer {
   default                                 '';    # False
   '~^https:\/\/www\.openstreetmap\.org\/' 'osm'; # True


@@ -192,11 +200,11 @@ map $tile_cache$http_referer$scheme$http_user_agent $deny_missing_referer {
 
 server {
     # IPv4
 
 server {
     # IPv4

-    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       80 deferred backlog=16384 reuseport default_server;
+    listen       443 ssl deferred backlog=16384 reuseport http2 default_server;

     # IPv6
     # IPv6

-    listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 default_server;
-    listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
+    listen       [::]:80 deferred backlog=16384 reuseport default_server;
+    listen       [::]:443 ssl deferred backlog=16384 reuseport http2 default_server;

     server_name  localhost;
 
     proxy_buffers 8 64k;
     server_name  localhost;
 
     proxy_buffers 8 64k;


@@ -344,25 +352,9 @@ server {
 
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';
 
       # Replace host header.
       proxy_set_header Host 'tile.openstreetmap.org';

-      # Do not pass cookies to backends.
-      proxy_set_header Cookie '';
-      # Do not pass Accept-Encoding to backends.
-      proxy_set_header Accept-Encoding '';
-      # Do not pass Accept to backends.
-      proxy_set_header Accept '';
-      # Do not pass Accept-Language to backends as unused.
-      proxy_set_header Accept-Language '';
-      proxy_set_header Accept-Charset '';
-      # Do not send origin, we allow all.
-      proxy_set_header origin '';
-      # Do not pass invalid headers to backend.
-      proxy_set_header X-Forwarded-Host '';
-      proxy_set_header X-Host '';
-      proxy_set_header Authorization '';
-      proxy_set_header Proxy-Authorization '';
-
-      # Drop partial requests
-      proxy_set_header range '';
+      # Drop all request headers and request body
+      proxy_pass_request_headers off;
+      proxy_pass_request_body off;

 
       # Do not allow setting cookies from backends due to caching.
       proxy_ignore_headers Set-Cookie;
 
       # Do not allow setting cookies from backends due to caching.
       proxy_ignore_headers Set-Cookie;


@@ -421,6 +413,11 @@ server {
         return 418;
       }
 
         return 418;
       }
 

+      if ($censored_referer) {
+        set $limit_rate 512;
+        return 451 "Unavailable at OSMF Board request";
+      }
+

       # Strip any ?query parameters from urls
       set $args '';
 
       # Strip any ?query parameters from urls
       set $args '';