From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Jul 2015 21:29:51 +0000 (+0100)
Subject: Fix rubocop warnings
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/59561cc508033895737b6206a08ed8887dba012a?hp=128aeb63b801da2af98609e2d60309723027b3d5;ds=sidebyside

Fix rubocop warnings
---

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index d33d7658d..341f3d664 100644
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -19,6 +19,10 @@
 
 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]
@@ -30,10 +34,6 @@ end
 
 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|
@@ -52,4 +52,3 @@ postgresql_user "replication" do
   password passwords["replication"]
   replication true
 end
-