From: Paul Norman Date: Mon, 8 May 2023 06:47:39 +0000 (-0700) Subject: Update to tilelog v1.5.0 X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/8fc665c02b7238a368e8a40b7d057a2857ea8632 Update to tilelog v1.5.0 --- diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 44791c288..9ab18f93b 100644 --- a/cookbooks/tilelog/recipes/default.rb +++ b/cookbooks/tilelog/recipes/default.rb @@ -31,7 +31,7 @@ end python_package "tilelog" do python_virtualenv tilelog_directory python_version "3" - version "1.4.1" + version "1.5.0" end directory tilelog_output_directory do diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb index 2c8799b1c..5ce9180cc 100644 --- a/cookbooks/tilelog/templates/default/tilelog.erb +++ b/cookbooks/tilelog/templates/default/tilelog.erb @@ -18,10 +18,11 @@ export AWS_REGION="eu-west-1" 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}" --app "${APPFILE}" + --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" --country "${COUNTRYFILE}" -mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${OUTDIR}" +mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}" rm -rf "$TMPDIR"