X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a156101e6b92c33e5523424277cdb36b7dd0a766..f3d8422f1c3d8c1e8cf3cc04d9982b8cfb8878c4:/cookbooks/planet/templates/default/planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index d367fe5d2..c7f8b2658 100644
--- 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
@@ -78,77 +78,82 @@ time nice -n 19 /opt/planet-dump-ng/planet-dump-ng \
 function mk_torrent {
   type="$1"
   format="$2"
-  web_dir="$3"
+  dir="$3"
+  s_year="$4"
+  web_dir="${dir}${s_year}"
   name="${type}-${date}.osm.${format}"
   web_path="${web_dir}/${name}"
+  rss_web_dir="https://planet.openstreetmap.org/${dir}"
+  rss_file="${type}-${format}-rss.xml"
+  torrent_file="${name}.torrent"
+  torrent_url="${rss_web_dir}${s_year}/${torrent_file}"
 
-  mktorrent -l 22 ${name} \
+  # create .torrent file
+  mktorrent -l 22 "${name}" \
      -a udp://tracker.opentrackr.org:1337 \
      -a udp://tracker.datacenterlight.ch:6969/announce,http://tracker.datacenterlight.ch:6969/announce \
      -a udp://tracker.torrent.eu.org:451 \
      -a udp://tracker-udp.gbitt.info:80/announce,http://tracker.gbitt.info/announce,https://tracker.gbitt.info/announce \
      -a http://retracker.local/announce \
-     -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://planet.openstreetmap.org/${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} \
-     -c "OpenStreetMap ${type} database dump, licensed under https://opendatacommons.org/licenses/odbl/ by OpenStreetMap contributors" \
-     -o ${name}.torrent
-}
-
-# Function to create RSS/Atom feed for .torrent files
-function mk_rss {
-  type="$1"
-  format="$2"
-  web_dir="$3"
-  disk_dir="$4"
-  old_pwd="$PWD"
-  rss_name="${type}-${format}-rss.xml"
-  rss_path="${old_pwd}/${rss_name}"
-  rss_baseurl="https://planet.openstreetmap.org"
-  rss_dirurl="${rss_baseurl}/${web_dir}"
-
-  cd "${disk_dir}"
-
-  # RSS header
-  printf '%s\n' \
-     '<?xml version="1.0" encoding="UTF-8"?>' \
-     '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">' \
-     '<channel>' > "${rss_path}"
-  cat >> "${rss_path}" <<__EOF
-     <title>OpenStreetMap ${type} torrent RSS</title>
-     <link>${rss_dirurl}</link>
-     <atom:link href="${rss_dirurl}/${rss_name}" rel="self" type="application/rss+xml" />
-     <description>RSS feed for ${type}.osm.${format}.torrent</description>
-     <language>en-us</language>
-     <lastBuildDate>`date -R`</lastBuildDate>
-__EOF
-
-  # add RSS item for each torrent
-  for tf in `ls -1t *.torrent | grep -v latest | head -n 5`
-  do
-    cat >> "${rss_path}" <<__EOF
-     <item>
-        <title>${tf}</title>
-        <guid>${rss_dirurl}/${tf}</guid>
-        <pubDate>`date -R -r ${tf}`</pubDate>
-        <category>OpenStreetMap</category>
-        <link>${rss_dirurl}/${tf}</link>
-        <enclosure url="${rss_dirurl}/${tf}" length="`find -maxdepth 1 -name ${tf%.torrent} -printf "%s"`" type="application/x-bittorrent" />
-        <description>OSM Torrent ${tf} (torrent size: `find -maxdepth 1 -name ${tf} -printf "%s"`)</description>
-     </item>
-__EOF
-  done
-
-  # RSS footer
-  printf '</channel>\n</rss>\n' >> "${rss_path}"
-  cd "${old_pwd}"
-  mv "${rss_path}" "${disk_dir}"
+     -w "https://planet.openstreetmap.org/${web_path}" \
+     -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
+
+  # create .xml global RSS headers if missing
+  torrent_time_rfc="$(date -R -r ${torrent_file})"
+  test -f "${rss_file}" || echo "<x/>" | xmlstarlet select --xml-decl --indent \
+	-N "atom=http://www.w3.org/2005/Atom" \
+	-N "dcterms=http://purl.org/dc/terms/" \
+	-N "content=http://purl.org/rss/1.0/modules/content/" \
+	--encode "UTF-8" \
+	--template \
+	--match / \
+	--elem "rss" \
+		--attr "version" --output "2.0" --break \
+		--attr "atom:DUMMY" --break \
+	--elem "channel" \
+	--elem "title" --output "OpenStreetMap ${type} ${format} torrent RSS" --break \
+	--elem "link"  --output "${rss_web_dir}" --break \
+	--elem "atom:link" \
+		--attr "href" --output "${rss_web_dir}/${rss_file}" --break \
+		--attr "rel" --output "self" --break \
+		--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}" \
+	-s "//item[1]" -t elem -n "guid" -v "${torrent_url}" \
+	-s "//item[1]" -t elem -n "link" -v "${torrent_url}" \
+	-s "//item[1]" -t elem -n "pubDate" -v "${torrent_time_rfc}" \
+	-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}" \
+	-u /rss/channel/lastBuildDate -v "${torrent_time_rfc}" \
+	-d /rss/@atom:DUMMY \
+	-d "//item[position()>5]" \
+	"${rss_file}"
 }
 
 # Function to install a dump in place
@@ -159,17 +164,23 @@ function install_dump {
   year="$4"
   name="${type}-${date}.osm.${format}"
   latest="${type}-latest.osm.${format}"
+  rss_file="${type}-${format}-rss.xml"
 
   md5sum "${name}" > "${name}.md5"
   mkdir -p "${dir}/${year}"
-  test -f "${name}.torrent" && mv "${name}.torrent" "${dir}/${year}"
   mv "${name}" "${name}.md5" "${dir}/${year}"
   ln -sf "${year:-.}/${name}" "${dir}/${latest}"
+  test -f "${name}.torrent" && mv "${name}.torrent" "${dir}/${year}" && ln -sf "${year:-.}/${name}.torrent" "${dir}/${latest}.torrent"
+  test -f "${rss_file}" && xmllint --noout "${rss_file}" && cp -f "${rss_file}" "${dir}"
   rm -f "${dir}/${latest}.md5"
   sed -e "s/${name}/${latest}/" "${dir}/${year}/${name}.md5" > "${dir}/${latest}.md5"
 }
 
 # Create *.torrent files
+mk_torrent "changesets" "bz2" "planet" "/${year}"
+mk_torrent "discussions" "bz2" "planet" "/${year}"
+mk_torrent "planet" "bz2" "planet" "/${year}"
+mk_torrent "history" "bz2" "planet/full-history" "/${year}"
 mk_torrent "planet" "pbf" "pbf"
 mk_torrent "history" "pbf" "pbf/full-history"
 
@@ -180,10 +191,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' -o -iname 'planet-*.pbf.torrent' -o -iname 'history-*.pbf.torrent' \) -delete
-
-# Create RSS feed of available *.torrent files to enable automatic seeders
-mk_rss "planet" "pbf" "pbf"  "<%= node[:planet][:dump][:pbf_directory] %>"
-mk_rss "history" "pbf" "pbf/full-history" "<%= node[:planet][:dump][:pbf_history_directory] %>"