tilecache: fix token windowing

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 a8f9378233dee2d2dfacbec53d535390036873f1..279d67e98c4b774ae9527413d8815d693b874f02 100755 (executable)
--- 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=4 # current + 4
 VALID_TOKEN=3600 # in seconds
-QOS_TOKENS=($(/usr/bin/oathtool --totp --window=${NUM_TOKENS} --time-step-size=${VALID_TOKEN}s -b <%= @totp_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