X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c09775bf0196a3aebfd459cf290220c969753cb9..8f6bf8b7cd2909565909a6f817426a3f6c8c0d80:/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 166545d61..869b30de6 100755
--- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
+++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
@@ -1,14 +1,18 @@
 #!/bin/bash
 # DO NOT EDIT - This file is being maintained by Chef
-
 set -e
-NUM_TOKENS=3 # current + 3
+
+NUM_TOKENS=4 # current + 4
 VALID_TOKEN=3600 # in seconds
-QOS_TOKENS=($(/usr/bin/oathtool --totp --window=${NUM_TOKENS} --time-step-size=${VALID_TOKEN}s <%= tokens[:tilecache_oath_key] %>))
 
-# ${qos_tokens[3]/[-1] } = OSM.org exclusive / current
-# ${qos_tokens[2]/[-2] } = tile.openstreetmap.org default
-# ${qos_tokens[1]/[-3] } = stale ~ 1 hour
+SECONDS_AGO=$((${NUM_TOKENS} * ${VALID_TOKEN}))
+OLD_TIME=$(/bin/date -u "+%Y-%m-%dT %H:%M:%S %z" -d "${SECONDS_AGO} seconds ago")
+QOS_TOKENS=($(/usr/bin/oathtool --totp --now="${OLD_TIME}" --window=${NUM_TOKENS} --time-step-size=${VALID_TOKEN}s -b "<%= @totp_key %>"))
+
+# ${qos_tokens[4]/[-1] } = OSM.org exclusive / current
+# ${qos_tokens[3]/[-2] } = OSM.org exclusive / stale
+# ${qos_tokens[2]/[-3] } = tile.openstreetmap.org default
+# ${qos_tokens[1]/[-4] } = stale ~ 1 hour
 # ${qos_tokens[0]} = expired
 
 # Test if number of tokens returned by oathtool is expected number
@@ -18,8 +22,9 @@ if [ "${#QOS_TOKENS[@]}" -ne "$((${NUM_TOKENS}+1))" ]; then
 fi
 
 QOS_TOKEN_OSM=${QOS_TOKENS[-1]} # Cookie set by openstreetmap.org
-QOS_TOKEN_DEFAULT=${QOS_TOKENS[-2]} # Cookie presented by tile.openstreetmap.org to browsers
-QOS_TOKEN_STALE=${QOS_TOKENS[-3]} # Cookie which has become stale and will be replaced
+QOS_TOKEN_OSM_STALE=${QOS_TOKENS[-2]} # Cookie set by openstreetmap.org stale
+QOS_TOKEN_DEFAULT=${QOS_TOKENS[-3]} # Cookie presented by tile.openstreetmap.org to browsers
+QOS_TOKEN_STALE=${QOS_TOKENS[-4]} # Cookie which has become stale and will be replaced
 
 if [ -z "$QOS_TOKEN_OSM" -o -z "$QOS_TOKEN_DEFAULT" -o -z "$QOS_TOKEN_STALE" ]; then
   >&2 echo "ERROR: Unexpected blank token"
@@ -27,16 +32,19 @@ 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 4096; # Default Rate (No QoS cookie)
-"${QOS_TOKEN_STALE}" 16384; # Stale
+default 8192; # 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
 EOF
 
 cat <<EOF >/etc/nginx/conf.d/tile_qos_cookies.map
-default 'qos_token=${QOS_TOKEN_DEFAULT}; Secure; httponly; 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
 
-/etc/init.d/nginx configtest && service nginx reload
+# Check config, reload config and fail safe
+/etc/init.d/nginx configtest 2>/dev/null && /bin/systemctl try-reload-or-restart nginx