X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8fc665c02b7238a368e8a40b7d057a2857ea8632..ed4958d01f094f96766531dbb4b685656a52ab29:/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 5ce9180cc..978974d89 100644 --- a/cookbooks/tilelog/templates/default/tilelog.erb +++ b/cookbooks/tilelog/templates/default/tilelog.erb @@ -4,6 +4,7 @@ set -e if [ -z "$DATE" ] then DATE=$(date -u -d "1 day ago" "+%Y-%m-%d") + YEAR=$(date -u -d "1 day ago" "+%Y") fi OUTDIR="<%= @output_dir %>" @@ -20,9 +21,15 @@ HOSTFILE="hosts-${DATE}.csv" APPFILE="apps-${DATE}.csv" COUNTRYFILE="countries-${DATE}.csv" -nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \ +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}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}" +/opt/awscli/v2/current/bin/aws --profile=osm-pds-upload s3 cp --storage-class=INTELLIGENT_TIERING --no-progress "${OUTDIR}/${TILEFILE}" "s3://osm-planet-eu-central-1/tile_logs/standard_layer/tiles/${YEAR}/${TILEFILE}" +/opt/awscli/v2/current/bin/aws --profile=osm-pds-upload s3 cp --storage-class=INTELLIGENT_TIERING --no-progress "${OUTDIR}/${HOSTFILE}" "s3://osm-planet-eu-central-1/tile_logs/standard_layer/hosts/${YEAR}/${HOSTFILE}" +/opt/awscli/v2/current/bin/aws --profile=osm-pds-upload s3 cp --storage-class=INTELLIGENT_TIERING --no-progress "${OUTDIR}/${APPFILE}" "s3://osm-planet-eu-central-1/tile_logs/standard_layer/apps/${YEAR}/${APPFILE}" +/opt/awscli/v2/current/bin/aws --profile=osm-pds-upload s3 cp --storage-class=INTELLIGENT_TIERING --no-progress "${OUTDIR}/${COUNTRYFILE}" "s3://osm-planet-eu-central-1/tile_logs/standard_layer/countries/${YEAR}/${COUNTRYFILE}" + rm -rf "$TMPDIR"