dev: add aria2 to required packages

[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 7e2e23fd7c08181d313621ae9c322e82812f8be8..2c8799b1c1fc9c6dd44b85a2a0b90702267f4ad7 100644 (file)
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -1,19 +1,27 @@
 #!/bin/sh
+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 %>"
 TMPDIR=$(mktemp -d -t tilelog.XXXXXXXXX)
 
-cd $TMPDIR
+cd "$TMPDIR"
 
 export AWS_ACCESS_KEY_ID="AKIASQUXHPE7JFCFMOUP"
 export AWS_SECRET_ACCESS_KEY="<%= @aws_key %>"
 export AWS_REGION="eu-west-1"
 
-nice -n 19 /opt/tilelog/bin/tilelog --date ${DATE} && mv tiles-${DATE}.txt.xz "${OUTDIR}"
+TILEFILE="tiles-${DATE}.txt.xz"
+HOSTFILE="hosts-${DATE}.csv"
+APPFILE="apps-${DATE}.csv"
 
-rm -rf $TMPDIR
+nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \
+  --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}"
+
+mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${OUTDIR}"
+
+rm -rf "$TMPDIR"