From 015a615b98e53491006d57d8d5de49bddd5b9338 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 15 Jun 2019 16:25:09 +0100 Subject: [PATCH] Change tile cache QOS token name to match main web site --- .../templates/default/nginx_generate_tilecache_qos_map.erb | 2 +- cookbooks/tilecache/templates/default/nginx_tile.conf.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb index 683fdf272..869b30de6 100755 --- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb +++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb @@ -40,7 +40,7 @@ default 8192; # Default Rate (No QoS cookie) EOF cat </etc/nginx/conf.d/tile_qos_cookies.map -default 'qos_token=${QOS_TOKEN_DEFAULT}; Max-Age=${VALID_TOKEN}; Domain=openstreetmap.org; Path=/'; # Cookie Domain per RFC6265 +default '_osm_totp_token=${QOS_TOKEN_DEFAULT}; Max-Age=${VALID_TOKEN}; Domain=openstreetmap.org; Path=/'; # Cookie Domain per RFC6265 "${QOS_TOKEN_DEFAULT}" ''; # Do not Set-Cookie. # Default "${QOS_TOKEN_OSM_STALE}" ''; # Do not Set-Cookie. # Exclusive Stale "${QOS_TOKEN_OSM}" ''; # Do not Set-Cookie. # Exclusive diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb index 036a3506f..a6962d893 100644 --- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb +++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb @@ -29,12 +29,12 @@ geo $tile_cache { } # Rates table based on current cookie value -map $cookie_qos_token $limit_rate_qos { +map $cookie__osm_totp_token $limit_rate_qos { include /etc/nginx/conf.d/tile_qos_rates.map; } # Set-Cookie table based on current cookie value -map $cookie_qos_token $cookie_qos_token_set { +map $cookie__osm_totp_token $cookie_qos_token_set { include /etc/nginx/conf.d/tile_qos_cookies.map; } -- 2.43.2