Change default postgres version for tile servers to 14

[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 86eea918b5fa9034f804563b90305cf83a267b91..0cb24ce4d75f9260c0059c492e8a1dcbf44a4fed 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
 
 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 %>"
 fi
 
 OUTDIR="<%= @output_dir %>"


@@ -17,10 +17,13 @@ export AWS_REGION="eu-west-1"
 
 TILEFILE="tiles-${DATE}.txt.xz"
 HOSTFILE="hosts-${DATE}.csv"
 
 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}"
+nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" \
+  --generate-success --generate-minimise --generate-location \
+  --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" --country "${COUNTRYFILE}"

 
 

-mv "${TILEFILE}" "${HOSTFILE}" "${OUTDIR}"
+mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}"

 
 rm -rf "$TMPDIR"
 
 rm -rf "$TMPDIR"