X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/514777d2f84ab1ebb259ab62ddf57b8c4d1ecc72..ecb5d5beac1e41d30e47daa6a034c59b33027d12:/cookbooks/nominatim/recipes/master.rb diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb index 2e0094152..341f3d664 100644 --- a/cookbooks/nominatim/recipes/master.rb +++ b/cookbooks/nominatim/recipes/master.rb @@ -17,12 +17,23 @@ # limitations under the License. # -include_recipe "nominatim::base" +include_recipe "git" passwords = data_bag_item("nominatim", "passwords") database_cluster = node[:nominatim][:database][:cluster] 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| @@ -41,12 +52,3 @@ postgresql_user "replication" do 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