Update carto stylesheet to v2.32.0

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

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index e113cbfd3989c255633093a408535e2d188b2c5e..341f3d664dc1befe1ffd11941e8d1ece02da21f5 100644 (file)
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -17,11 +17,23 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "nominatim::base"
+include_recipe "git"

 
 passwords = data_bag_item("nominatim", "passwords")
 
 passwords = data_bag_item("nominatim", "passwords")

+database_cluster = node[:nominatim][:database][:cluster]

 home_directory = data_bag_item("accounts", "nominatim")["home"]
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 

+git "#{home_directory}/nominatim" do
+  action :checkout
+  repository node[:nominatim][:repository]
+  enable_submodules true
+  user "nominatim"
+  group "nominatim"
+  notifies :run, "execute[compile_nominatim]"
+end
+
+include_recipe "nominatim::base"
+

 superusers = %w(tomh lonvia twain nominatim)
 
 superusers.each do |user|
 superusers = %w(tomh lonvia twain nominatim)
 
 superusers.each do |user|


@@ -40,12 +52,3 @@ postgresql_user "replication" do
   password passwords["replication"]
   replication true
 end
   password passwords["replication"]
   replication true
 end

-
-git "#{home_directory}/nominatim" do
-  action :checkout
-  repository node[:nominatim][:repository]
-  enable_submodules true
-  user "nominatim"
-  group "nominatim"
-  notifies :run, "execute[compile_nominatim]"
-end