Update "latest" links for planet dump files

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index d41e322a31f2710b68f967dc6c34bca3cd82d6be..3490d91e1c5fdc46dcc779958de457543f116ebe 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -178,6 +178,7 @@ template "#{source_directory}/settings/local.php" do
   owner "nominatim"
   group "nominatim"
   mode 0664
+  variables :postgres_version => database_version
 end
 
 template "#{source_directory}/settings/ip_blocks.conf" do
@@ -242,17 +243,41 @@ munin_plugin "nominatim_importlag" do
 end
 
 munin_plugin "nominatim_query_speed" do
-  target "#{source_directory}/munin/nominatim_query_speed"
+  target "#{source_directory}/munin/nominatim_query_speed_querylog"
 end
 
 munin_plugin "nominatim_requests" do
-  target "#{source_directory}/munin/nominatim_requests"
+  target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 
+remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do
+  action :create_if_missing
+  source "http://www.nominatim.org/data/wikipedia_article.sql.bin"
+  owner  "nominatim"
+  group  "nominatim"
+  mode   0644
+end
+
+remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do
+  action :create_if_missing
+  source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin"
+  owner  "nominatim"
+  group  "nominatim"
+  mode   0644
+end
+
+remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do
+  action :create_if_missing
+  source "http://www.nominatim.org/data/gb_postcode_data.sql.gz"
+  owner  "nominatim"
+  group  "nominatim"
+  mode   0644
+end
+
 template "/usr/local/bin/backup-nominatim" do
   source "backup-nominatim.erb"
   owner "root"
@@ -260,3 +285,10 @@ template "/usr/local/bin/backup-nominatim" do
   mode 0755
 end
 
+directory File.dirname(node[:nominatim][:flatnode_file]) do
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
+  recursive true
+end
+