X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/20b2c44f11ad74f2e34bc9f8aee0be22ebe58231..241fcb72fc59ac141ed78e05f56b6b3f291da88e:/cookbooks/planet/templates/default/planetdump.erb?ds=sidebyside diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb index ea474ed93..6b3a83656 100644 --- a/cookbooks/planet/templates/default/planetdump.erb +++ b/cookbooks/planet/templates/default/planetdump.erb @@ -26,13 +26,6 @@ if [ -f /tmp/planetdump.lock ]; then fi fi -# Redirect this shell's output to a file. This is so that it -# can be emailed later, since this script is run from incron -# and incron doesn't yet support MAILTO like cron does. The -# command below appears to work in bash as well as dash. -logfile="/tmp/planetdump.log.$$" -exec > "${logfile}" 2>&1 - # Create lock file echo $$ > /tmp/planetdump.lock @@ -40,16 +33,6 @@ echo $$ > /tmp/planetdump.lock function cleanup { # Remove the lock file rm /tmp/planetdump.lock - - # Send an email with the output, since incron doesn't yet - # support doing this in the incrontab - if [[ -s "$logfile" ]] - then - mailx -s "Planet dump output: ${file}" zerebubuth@gmail.com < "${logfile}" - fi - - # Remove the log file - rm -f "${logfile}" } # Remove lock on exit @@ -99,12 +82,11 @@ function mk_torrent { -w "https://ftp5.gwdg.de/pub/misc/openstreetmap/planet.openstreetmap.org/${web_path}" \ -w "https://ftpmirror.your.org/pub/openstreetmap/${web_path}" \ -w "https://mirror.init7.net/openstreetmap/${web_path}" \ - -w "https://free.nchc.org.tw/osm.planet/${web_path}" \ -w "https://ftp.fau.de/osm-planet/${web_path}" \ -w "https://ftp.spline.de/pub/openstreetmap/${web_path}" \ - -w "https://osm.openarchive.site/${name}" \ -w "https://downloads.opencagedata.com/planet/${name}" \ -w "https://planet.osm-hr.org/${web_path}" \ + -w "https://planet.maps.mail.ru/${web_path}" \ -c "OpenStreetMap ${type} data export, licensed under https://opendatacommons.org/licenses/odbl/ by OpenStreetMap contributors" \ -o "${torrent_file}" > /dev/null @@ -129,14 +111,16 @@ function mk_torrent { --attr "type" --output "application/rss+xml" --break \ --break \ --elem "description" --output "${type}.osm.${format}.torrent RSS feed" --break \ + --elem "copyright" --output "Source: OpenStreetMap contributors, under ODbL 1.0 licence" --break \ --elem "generator" --output "OpenStreetMap xmlstarlet powered shell script v1.0" --break \ --elem "language" --output "en" --break \ --elem "lastBuildDate" --output "${torrent_time_rfc}" \ > "${rss_file}" # add newly created .torrent file as new entry to .xml RSS feed, removing excess entries + torrent_size="$(stat --format="%s" ${torrent_file})" xmlstarlet edit --inplace \ - -a "//channel" -t elem -n item -v "" \ + -a "//lastBuildDate" -t elem -n item -v "" \ -s "//item[1]" -t elem -n "title" -v "${torrent_file}" \ -s "//item[1]" -t elem -n "guid" -v "${torrent_url}" \ -s "//item[1]" -t elem -n "link" -v "${torrent_url}" \ @@ -144,9 +128,9 @@ function mk_torrent { -s "//item[1]" -t elem -n "category" -v "OpenStreetMap data" \ -s "//item[1]" -t elem -n "enclosure" \ -s "//item[1]"/enclosure -t attr -n "type" -v "application/x-bittorrent" \ + -s "//item[1]"/enclosure -t attr -n "length" -v "${torrent_size}" \ -s "//item[1]"/enclosure -t attr -n "url" -v "${torrent_url}" \ -s "//item[1]" -t elem -n "description" -v "OpenStreetMap torrent ${torrent_file}" \ - -s "//item[1]" -t elem -n "comments" -v "Source: OpenStreetMap contributors, under ODbL 1.0 licence" \ -u /rss/channel/lastBuildDate -v "${torrent_time_rfc}" \ -d /rss/@atom:DUMMY \ -d "//item[position()>5]" \ @@ -188,14 +172,3 @@ install_dump "planet" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${yea install_dump "history" "bz2" "<%= node[:planet][:dump][:xml_history_directory] %>" "${year}" install_dump "planet" "pbf" "<%= node[:planet][:dump][:pbf_directory] %>" install_dump "history" "pbf" "<%= node[:planet][:dump][:pbf_history_directory] %>" - -# Remove pbf dumps older than 90 days -find "<%= node[:planet][:dump][:pbf_directory] %>" "<%= node[:planet][:dump][:pbf_history_directory] %>" \ - -maxdepth 1 -mindepth 1 -type f -mtime +90 \ - \( \ - -iname 'planet-*.pbf' \ - -o -iname 'history-*.pbf' \ - -o -iname 'planet-*.pbf.md5' \ - -o -iname 'history-*.pbf.md5' \ - \) \ - -delete