X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d924fba4d5e22c9a16d5eebbc8f310d21f171959..3e8b676750834c173b58619b4b8a10fc8204cc2a:/cookbooks/tilelog/templates/default/tilelog.erb?ds=sidebyside diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb index 9294f82d6..86eea918b 100644 --- a/cookbooks/tilelog/templates/default/tilelog.erb +++ b/cookbooks/tilelog/templates/default/tilelog.erb @@ -1,4 +1,5 @@ #!/bin/sh +set -e if [ -z "$DATE" ] then @@ -8,10 +9,18 @@ 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" + +nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \ + --tile "${TILEFILE}" --host "${HOSTFILE}" + +mv "${TILEFILE}" "${HOSTFILE}" "${OUTDIR}" + +rm -rf "$TMPDIR"