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

[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 683fdf2727088482b637e53854260795e65ee73c..deec588c375f672b5303e580c73e38c85627671d 100755 (executable)
--- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
+++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
@@ -40,11 +40,11 @@ default 8192; # 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 2>/dev/null && /bin/systemctl try-reload-or-restart nginx
+# /etc/init.d/nginx configtest 2>/dev/null && /bin/systemctl try-reload-or-restart nginx