From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Sep 2020 07:25:58 +0000 (+0100)
Subject: Fix new cookstyle warnings
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4f7fa07759cca622d60b960f1337c2a65ab0e667

Fix new cookstyle warnings
---

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 7a0f5b7b9..3845546bc 100644
--- 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 :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 }
diff --git a/cookbooks/postgresql/resources/user.rb b/cookbooks/postgresql/resources/user.rb
index 2fac86731..ad8fed4d5 100644
--- 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 :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}'" : ""
diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 8a6b23b28..009b0a6d7 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -27,11 +27,7 @@ package "openstreetmap-cgimap-bin" do
   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] || []