X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/64d9f0a80c133eb486067b019f82499060a4767c..41487eea939ced6fb053fac4f68f77a314e4dfa5:/cookbooks/planet/templates/default/planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index d2da54bb7..f0708f2f2 100644
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -78,36 +78,39 @@ 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/${web_dir}"
+  rss_web_dir="https://planet.openstreetmap.org/${dir}"
   rss_file="${type}-${format}-rss.xml"
   torrent_file="${name}.torrent"
-  torrent_url="${rss_web_dir}/${torrent_file}"
+  torrent_url="${rss_web_dir}${s_year}/${torrent_file}"
 
   # create .torrent file
-  mktorrent -l 22 ${name} \
+  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://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.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}
+     -o "${torrent_file}" > /dev/null
 
   # create .xml global RSS headers if missing
-  torrent_time_rfc="`date -R -r ${torrent_file}`"
+  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/" \
@@ -115,7 +118,9 @@ function mk_torrent {
 	--encode "UTF-8" \
 	--template \
 	--match / \
-	--elem "rss" --attr "version" --output "2.0" --break \
+	--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 \
@@ -125,28 +130,30 @@ 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}
+	> "${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 \
-	-s /rss/channel -t elem -n NEW_item  \
-	-s //NEW_item -t elem -n "title" -v "${torrent_file}" \
-	-s //NEW_item -t elem -n "guid" -v "${torrent_url}" \
-	-s //NEW_item -t elem -n "pubDate" -v "${torrent_time_rfc}" \
-	-s //NEW_item -t elem -n "category" -v "OpenStreetMap data" \
-	-s //NEW_item -t elem -n "link" -v "${torrent_url}" \
-	-s //NEW_item -t elem -n "enclosure" \
-		-s //NEW_item/enclosure -t attr -n "type" -v "application/x-bittorrent" \
-		-s //NEW_item/enclosure -t attr -n "url" -v "${torrent_url}" \
-	-s //NEW_item -t elem -n "description" -v "OpenStreetMap torrent ${torrent_file}" \
-	-s //NEW_item -t elem -n "comments" -v "Source: OpenStreetMap contributors, under ODbL 1.0 licence" \
-	-r //NEW_item -v "item" \
+	-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/channel/item[position() <= count(/rss/channel/item) - 5]' \
-	${rss_file}
+	-d /rss/@atom:DUMMY \
+	-d "//item[position()>5]" \
+	"${rss_file}"
 }
 
 # Function to install a dump in place
@@ -164,16 +171,16 @@ function install_dump {
   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}/${year}"
+  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 "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"