X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/037d7b29707effbc211c4ea5617965c50bb45ab1..be5a228b5a0cef503d517e5e109b652c5501ee40:/cookbooks/tilelog/templates/default/tilelog.erb diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb index 8fa73cee0..5ce9180cc 100644 --- a/cookbooks/tilelog/templates/default/tilelog.erb +++ b/cookbooks/tilelog/templates/default/tilelog.erb @@ -3,7 +3,7 @@ set -e if [ -z "$DATE" ] then - DATE=$(date -d "1 day ago" "+%Y-%m-%d") + DATE=$(date -u -d "1 day ago" "+%Y-%m-%d") fi OUTDIR="<%= @output_dir %>" @@ -18,10 +18,11 @@ export AWS_REGION="eu-west-1" TILEFILE="tiles-${DATE}.txt.xz" HOSTFILE="hosts-${DATE}.csv" APPFILE="apps-${DATE}.csv" +COUNTRYFILE="countries-${DATE}.csv" nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \ - --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" + --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" --country "${COUNTRYFILE}" -mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${OUTDIR}" +mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}" rm -rf "$TMPDIR"