tilecache: switch nginx upstream to squid port 8080

[chef.git] / 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 279d67e98c4b774ae9527413d8815d693b874f02..869b30de63de5d7f35a0223af28321c93b80021a 100755 (executable)
--- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
+++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
@@ -32,7 +32,7 @@ if [ -z "$QOS_TOKEN_OSM" -o -z "$QOS_TOKEN_DEFAULT" -o -z "$QOS_TOKEN_STALE" ];
 fi
 
 cat <<EOF >/etc/nginx/conf.d/tile_qos_rates.map
-default 24576; # Default Rate (No QoS cookie)
+default 8192; # Default Rate (No QoS cookie)
 "${QOS_TOKEN_STALE}" 24576; # Stale
 "${QOS_TOKEN_DEFAULT}" 24576; # Default
 "${QOS_TOKEN_OSM_STALE}" 32768; # Exclusive Stale
@@ -40,10 +40,11 @@ default 24576; # Default Rate (No QoS cookie)
 EOF
 
 cat <<EOF >/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
 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