Switch planet used for taginfo to history planet

diff --git a/cookbooks/planet/recipes/current.rb b/cookbooks/planet/recipes/current.rb
index c7a4a8f50d1cb807191d03b47cd9829252c84646..fefcaaad7d48433d310175ba1ab7464d1f8a5726 100644 (file)
--- a/cookbooks/planet/recipes/current.rb
+++ b/cookbooks/planet/recipes/current.rb
@@ -43,9 +43,9 @@ directory "/var/lib/planet" do
   mode "755"
 end
 
   mode "755"
 end
 

-remote_file "/var/lib/planet/planet.pbf" do
+remote_file "/var/lib/planet/planet.osh.pbf" do

   action :create_if_missing
   action :create_if_missing

-  source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
+  source "https://planet.openstreetmap.org/pbf/full-history/history-latest.osm.pbf"

   owner "planet"
   group "planet"
   mode "644"
   owner "planet"
   group "planet"
   mode "644"

diff --git a/cookbooks/planet/templates/default/planet-update-file.erb b/cookbooks/planet/templates/default/planet-update-file.erb
index 36786e23248fc360c9de3c7add158ad42f1b97d5..4b067e6401cf26bd505a381c7f33e89768e61498 100644 (file)
--- a/cookbooks/planet/templates/default/planet-update-file.erb
+++ b/cookbooks/planet/templates/default/planet-update-file.erb
@@ -4,11 +4,13 @@
 
 # setup
 
 
 # setup
 

+SUFFIX="osh.pbf"
+

 PLANETDIR="/var/lib/planet"
 PLANETDIR="/var/lib/planet"

-PLANETPREV="${PLANETDIR}/planet-previous.pbf"
-PLANETCURR="${PLANETDIR}/planet.pbf"
-PLANETNEW="${PLANETDIR}/planet-new.pbf"
-PLANETTMP="${PLANETDIR}/planet-tmp.pbf"
+PLANETPREV="${PLANETDIR}/planet-previous.${SUFFIX}"
+PLANETCURR="${PLANETDIR}/planet.${SUFFIX}"
+PLANETNEW="${PLANETDIR}/planet-new.${SUFFIX}"
+PLANETTMP="${PLANETDIR}/planet-tmp.${SUFFIX}"

 
 pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETCURR"
 retval=$?
 
 pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETCURR"
 retval=$?

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index be0cbb6142a4a7c92fc1e48ce19cd88d4afc8287..fc5d424e30b4092800c111fef13a1fb26d17ce5f 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -149,7 +149,7 @@ node[:taginfo][:sites].each do |site|
     settings["paths"]["bin_dir"] = "#{directory}/build/src"
     settings["sources"]["download"] = ""
     settings["sources"]["create"] = "db languages projects wiki"
     settings["paths"]["bin_dir"] = "#{directory}/build/src"
     settings["sources"]["download"] = ""
     settings["sources"]["create"] = "db languages projects wiki"

-    settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.pbf"
+    settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.osh.pbf"

     settings["sources"]["db"]["bindir"] = "#{directory}/build/src"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     settings["sources"]["db"]["bindir"] = "#{directory}/build/src"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"