X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c5c96fb5c7e7f3a93a8dad7b6b5f178632bce19c..c6902ea9afba17351101f28b4a401e5193b89c1b:/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb 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 279d67e98..a2bdbb01d 100755 --- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb +++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb @@ -32,18 +32,19 @@ if [ -z "$QOS_TOKEN_OSM" -o -z "$QOS_TOKEN_DEFAULT" -o -z "$QOS_TOKEN_STALE" ]; fi cat </etc/nginx/conf.d/tile_qos_rates.map -default 24576; # Default Rate (No QoS cookie) -"${QOS_TOKEN_STALE}" 24576; # Stale -"${QOS_TOKEN_DEFAULT}" 24576; # Default -"${QOS_TOKEN_OSM_STALE}" 32768; # Exclusive Stale -"${QOS_TOKEN_OSM}" 32768; # Exclusive +default 8192; # Default Rate (No QoS cookie) +"${QOS_TOKEN_STALE}" 49152; # Stale +"${QOS_TOKEN_DEFAULT}" 49152; # Default +"${QOS_TOKEN_OSM_STALE}" 65536; # Exclusive Stale +"${QOS_TOKEN_OSM}" 65536; # Exclusive 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 "${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 EOF # Check config, reload config and fail safe -/etc/init.d/nginx configtest && /bin/systemctl try-reload-or-restart nginx +/etc/init.d/nginx configtest 2>/dev/null && /bin/systemctl try-reload-or-restart nginx