From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 12 Feb 2021 20:25:55 +0000 (+0100)
Subject: nominatim: download country grid before building
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/fa9733f7dabc4c26f8b3eed46e83aeeebb2bc674

nominatim: download country grid before building
---

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 7af64c90f..fbbe30af4 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -201,6 +201,14 @@ git source_directory do
   notifies :run, "execute[compile_nominatim]", :immediately
 end
 
+remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
+  action :create_if_missing
+  source "https://www.nominatim.org/data/country_grid.sql.gz"
+  owner "nominatim"
+  group "nominatim"
+  mode "644"
+end
+
 execute "compile_nominatim" do
   action :nothing
   user "nominatim"
@@ -273,14 +281,6 @@ external_data.each do |fname|
   end
 end
 
-remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
-  action :create_if_missing
-  source "https://www.nominatim.org/data/country_grid.sql.gz"
-  owner "nominatim"
-  group "nominatim"
-  mode "644"
-end
-
 if node[:nominatim][:state] == "off"
   cron_d "nominatim-backup" do
     action :delete