Fix rubocop warnings

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

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index d33d7658d6c860facd0611b4ad921c35f28a0fe8..341f3d664dc1befe1ffd11941e8d1ece02da21f5 100644 (file)
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -19,6 +19,10 @@
 
 include_recipe "git"
 
 
 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]
 git "#{home_directory}/nominatim" do
   action :checkout
   repository node[:nominatim][:repository]


@@ -30,10 +34,6 @@ end
 
 include_recipe "nominatim::base"
 
 
 include_recipe "nominatim::base"
 

-passwords = data_bag_item("nominatim", "passwords")
-database_cluster = node[:nominatim][:database][:cluster]
-home_directory = data_bag_item("accounts", "nominatim")["home"]
-

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


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

-