Merge pull request #589 from pnorman/tilelog_v1.5.0

[chef.git] / cookbooks / tilelog / templates / default / tilelog.erb

diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 8fa73cee0704d8760bb9c9e5d776d6ead7423da3..5ce9180cc07ebe0283e9fa42f6968aa8402cd2b3 100644 (file)
--- 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"