Copy planetdump output to admins list

[chef.git] / cookbooks / planet / templates / default / planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index e664f44f40f23996c1902708d71b33f0abb1b179..b2fd5f40d78804cecf213fa4a1a5e5883c51e07d 100644 (file)
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -45,7 +45,7 @@ function cleanup {
     # support doing this in the incrontab
     if [[ -s "$logfile" ]]
     then
-        mailx -s "Planet dump output: ${file}" zerebubuth@gmail.com < "${logfile}"
+        mailx -s "Planet dump output: ${file}" admins@openstreetmap.org zerebubuth@gmail.com < "${logfile}"
     fi
 
     # Remove the log file
@@ -105,6 +105,7 @@ function mk_torrent {
      -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,12 +130,14 @@ 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 "//lastBuildDate" -t elem -n item -v ""  \
        -s "//item[1]" -t elem -n "title" -v "${torrent_file}" \
@@ -144,9 +147,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]" \