Fix new cookstyle warnings

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 7a0f5b7b9e855eaa5456bb1fe974dacff838a53c..3845546bcfd65630512c9d47829b7da6852bdc4f 100644 (file)
--- a/cookbooks/postgresql/resources/execute.rb
+++ b/cookbooks/postgresql/resources/execute.rb
@@ -22,8 +22,8 @@ default_action :run
 property :command, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :command, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true

-property :user, :default => "postgres"
-property :group, :default => "postgres"
+property :user, :kind_of => String, :default => "postgres"
+property :group, :kind_of => String, :default => "postgres"

 
 action :run do
   options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group }
 
 action :run do
   options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group }

diff --git a/cookbooks/postgresql/resources/user.rb b/cookbooks/postgresql/resources/user.rb
index 2fac867314cff2a414f3f1dccc586f230d810abe..ad8fed4d5f8e5047628e276cda344f6b30f58d45 100644 (file)
--- a/cookbooks/postgresql/resources/user.rb
+++ b/cookbooks/postgresql/resources/user.rb
@@ -24,10 +24,10 @@ default_action :create
 property :user, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :password, :kind_of => String
 property :user, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :password, :kind_of => String

-property :superuser, :default => false
-property :createdb, :default => false
-property :createrole, :default => false
-property :replication, :default => false
+property :superuser, :kind_of => [TrueClass, FalseClass], :default => false
+property :createdb, :kind_of => [TrueClass, FalseClass], :default => false
+property :createrole, :kind_of => [TrueClass, FalseClass], :default => false
+property :replication, :kind_of => [TrueClass, FalseClass], :default => false

 
 action :create do
   password = new_resource.password ? "ENCRYPTED PASSWORD '#{new_resource.password.shellescape}'" : ""
 
 action :create do
   password = new_resource.password ? "ENCRYPTED PASSWORD '#{new_resource.password.shellescape}'" : ""

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 8a6b23b2878390818d7555248afe40d29c433bc8..009b0a6d7548a06d828f1338d4b6c158b25cde75 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -27,11 +27,7 @@ package "openstreetmap-cgimap-bin" do
   action :upgrade
 end
 
   action :upgrade
 end
 

-database_host = if node[:web][:readonly_database_host]
-                  node[:web][:readonly_database_host]
-                else
-                  node[:web][:database_host]
-                end
+database_host = node[:web][:readonly_database_host] || node[:web][:database_host]

 
 memcached_servers = node[:web][:memcached_servers] || []
 
 
 memcached_servers = node[:web][:memcached_servers] || []