From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Aug 2022 07:08:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/526'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6308ad8a8eb6ead04c2a1b9be15ee3a496cd09de?ds=inline;hp=-c

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

6308ad8a8eb6ead04c2a1b9be15ee3a496cd09de
diff --combined cookbooks/tilelog/templates/default/tilelog.erb
index 8fa73cee0,b833aeb16..2c8799b1c
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@@ -3,7 -3,7 +3,7 @@@ set -
  
  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 %>"
@@@ -17,11 -17,10 +17,11 @@@ export AWS_REGION="eu-west-1
  
  TILEFILE="tiles-${DATE}.txt.xz"
  HOSTFILE="hosts-${DATE}.csv"
 +APPFILE="apps-${DATE}.csv"
  
  nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \
 -  --tile "${TILEFILE}" --host "${HOSTFILE}"
 +  --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}"
  
 -mv "${TILEFILE}" "${HOSTFILE}" "${OUTDIR}"
 +mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${OUTDIR}"
  
  rm -rf "$TMPDIR"