Fix some correctness issues identified by foodcritic

diff --git a/cookbooks/dns/metadata.rb b/cookbooks/dns/metadata.rb
index d2b4f54db4f36c317fc7c8391048b89c4459217c..41820d87ff15d00891fc3b389be1c1c3b8f57264 100644 (file)
--- a/cookbooks/dns/metadata.rb
+++ b/cookbooks/dns/metadata.rb
@@ -4,3 +4,5 @@ license           "Apache 2.0"
 description       "Configure DNS management"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"
 description       "Configure DNS management"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"

+depends           "git"
+depends           "apache"

diff --git a/cookbooks/hardware/metadata.rb b/cookbooks/hardware/metadata.rb
index 813604617eca661de572d82b5b27dee6d649623e..013c604259a69cb638ec60a1341b52fe7a981487 100644 (file)
--- a/cookbooks/hardware/metadata.rb
+++ b/cookbooks/hardware/metadata.rb
@@ -4,3 +4,4 @@ license           "Apache 2.0"
 description       "Configures hardware"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"
 description       "Configures hardware"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"

+depends           "git"

diff --git a/cookbooks/munin/metadata.rb b/cookbooks/munin/metadata.rb
index d132b5ba73bc6a5d5acdceab1bda8b0fb01cecda..0a25ccb79046ee5f2c104536defbe69973b7917f 100644 (file)
--- a/cookbooks/munin/metadata.rb
+++ b/cookbooks/munin/metadata.rb
@@ -4,4 +4,5 @@ license           "Apache 2.0"
 description       "Installs and configures munin"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"
 description       "Installs and configures munin"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"

+depends           "apache"

 depends           "networking"
 depends           "networking"

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 29ea9ad654aca075d558ba75d7734725b1b50a5a..9e87e2855ce147731ac3b36a3d7d490f8ab78b76 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -185,7 +185,7 @@ template "/etc/shorewall/rules" do
   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  variables :family => "inet", :rules => []
+  variables :rules => []

   notifies :restart, resources(:service => "shorewall")
 end
 
   notifies :restart, resources(:service => "shorewall")
 end
 


@@ -290,7 +290,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
     owner "root"
     group "root"
     mode 0644

-    variables :family => "inet6", :rules => []
+    variables :rules => []

     notifies :restart, resources(:service => "shorewall6")
   end
 
     notifies :restart, resources(:service => "shorewall6")
   end
 

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 79a2dd1fbddb83e08823fd199b2bd1c839cde0e2..432da265f91449c33538667d56c43ac215719741 100644 (file)
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -48,7 +48,9 @@ end.collect do |node|
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]

-    keys[node[:keys][:ssh][:host_ecdsa_type]] = node[:keys][:ssh][:host_ecdsa_public]
+    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]
+
+    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]

   end
 
   Hash[
   end
 
   Hash[

diff --git a/cookbooks/osqa/metadata.rb b/cookbooks/osqa/metadata.rb
index da3014e8cbfffe17db7b54f985c9311a80754353..980b84b08532295541d5d9d3906216be9aa036e8 100644 (file)
--- a/cookbooks/osqa/metadata.rb
+++ b/cookbooks/osqa/metadata.rb
@@ -6,6 +6,7 @@ long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"
 depends           "apache"
 depends           "memcached"
 version           "1.0.0"
 depends           "apache"
 depends           "memcached"

+depends           "tools"

 
 attribute "osqa",
   :display_name => "OSQA",
 
 attribute "osqa",
   :display_name => "OSQA",

diff --git a/cookbooks/otrs/metadata.rb b/cookbooks/otrs/metadata.rb
index 562783630f0b2990528f3f548f9cc00ac5dd65a8..b8781adc9a8b43c623f9ae2bba3b9723ff2c4fdf 100644 (file)
--- a/cookbooks/otrs/metadata.rb
+++ b/cookbooks/otrs/metadata.rb
@@ -6,6 +6,7 @@ long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"
 version           "1.0.0"
 depends           "apache"
 depends           "postgresql"

+depends           "tools"

 
 attribute "otrs",
   :display_name => "OTRS",
 
 attribute "otrs",
   :display_name => "OTRS",

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c0f9c33e7a52af75bc098e659fb2c7d3d9b13130..901c0eedd7e00b3ab9fd82ffd251fc7e9a7ea782 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "tools"
 #
 
 include_recipe "tools"

+include_recipe "postgresql"

 include_recipe "apache::ssl"
 
 passwords = data_bag_item("otrs", "passwords")
 include_recipe "apache::ssl"
 
 passwords = data_bag_item("otrs", "passwords")

diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index b1420734da893c067497174df1144016e25426b4..aec51357c218a5a039edcffaf9d8fbab3e0b9605 100644 (file)
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/recipes/default.rb
@@ -63,7 +63,7 @@ template "/srv/stats.openstreetmap.org/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
   source "index.html.erb"
   owner "root"
   group "root"

-  mode 644
+  mode 0644

   variables :sites => node[:stats][:sites]
 end
 
   variables :sites => node[:stats][:sites]
 end