Fix some foodcritic style warnings

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index fbf8991f4b7c08a36a282b0575b179943045a2ca..50e3d375a6d95a2724d8f7347b68efb06ea759f3 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -59,7 +59,8 @@ search(:accounts, "*:*").each do |account|
       supports :manage_home => manage_home
     end
 
       supports :manage_home => manage_home
     end
 

-    remote_directory user_home do
+    remote_directory "/home/#{name}" do
+      path user_home

       source name.to_s
       owner name.to_s
       group name.to_s
       source name.to_s
       owner name.to_s
       group name.to_s

diff --git a/cookbooks/apt/definitions/apt_source.rb b/cookbooks/apt/definitions/apt_source.rb
index 382f9cce497dc2342d0f5285b0958accc9c183ad..cc847a01e5ca688d47cf55fa15b5ee33dee613e1 100644 (file)
--- a/cookbooks/apt/definitions/apt_source.rb
+++ b/cookbooks/apt/definitions/apt_source.rb
@@ -18,7 +18,7 @@
 #
 
 define :apt_source do
 #
 
 define :apt_source do

-  if node.apt.sources.include?(params[:name])
+  if node[:apt][:sources].include?(params[:name])

     source_action = :create
 
     if params[:key]
     source_action = :create
 
     if params[:key]

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 29ce0c063b8145347aeae3615c22ab7e727f8f1e..f8098faecd7c22b88e946d44ee2288a416429a47 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -129,7 +129,7 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
   end
 end
 

-if node[:postgresql][:clusters]["9.1/main"]
+if node[:postgresql][:clusters][:"9.1/main"]

   postgresql_user "apis" do
     cluster "9.1/main"
   end
   postgresql_user "apis" do
     cluster "9.1/main"
   end


@@ -158,7 +158,7 @@ if node[:postgresql][:clusters]["9.1/main"]
       group "apis"
       repository details[:repository]
       revision details[:revision]
       group "apis"
       repository details[:repository]
       revision details[:revision]

-      database_port node[:postgresql][:clusters]["9.1/main"][:port]
+      database_port node[:postgresql][:clusters][:"9.1/main"][:port]

       database_name database_name
       database_username "apis"
       run_migrations true
       database_name database_name
       database_username "apis"
       run_migrations true

diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb
index a1868edcf7e5d303d20af49730345c6f2102c962..455a1cac39bb1fee3eafc0a9b566498284e3490b 100644 (file)
--- a/cookbooks/owl/recipes/default.rb
+++ b/cookbooks/owl/recipes/default.rb
@@ -125,7 +125,7 @@ template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/datab
   group "owl"
   mode 0664
   notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
   group "owl"
   mode 0664
   notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"

-  only_if { node[:postgresql][:clusters]["9.1/main"] }
+  only_if { node[:postgresql][:clusters][:"9.1/main"] }

 end
 
 apache_site "owl.openstreetmap.org" do
 end
 
 apache_site "owl.openstreetmap.org" do

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index d2f36076fe9eb27545372d481095a3150222b8b8..8d3b2e8dc9ff4814582d6fc88d7ce60818e378b0 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -374,8 +374,8 @@ postgresql_munin "gis" do
   database "gis"
 end
 
   database "gis"
 end
 

-tile_uid = node[:etc][:passwd]["tile"][:uid]
-www_data_gid = node[:etc][:group]["www-data"][:gid]
+tile_uid = node[:etc][:passwd][:"tile"][:uid]
+www_data_gid = node[:etc][:group][:"www-data"][:gid]

 
 ruby_block node[:tile][:node_file] do
   block do
 
 ruby_block node[:tile][:node_file] do
   block do