Inherit manage_home attribute for accounts properly
authorTom Hughes <tom@compton.nu>
Sat, 4 Feb 2017 11:10:48 +0000 (11:10 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 4 Feb 2017 11:10:48 +0000 (11:10 +0000)
Because it's a boolean we can't just chain or operators as an
explict false will trigger fallback, so use Hash#fetch with default
values to do the fallback instead.

cookbooks/accounts/recipes/default.rb

index d6c7806..c6424b3 100644 (file)
@@ -31,7 +31,7 @@ search(:accounts, "*:*").each do |account|
   if details[:status]
     group_members = details[:members] || account["members"] || []
     user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
-    manage_user_home = details[:manage_home] || account["manage_home"] || node[:accounts][:manage_home]
+    manage_user_home = details.fetch(:manage_home, account.fetch("manage_home", node[:accounts][:manage_home]))
 
     group_members = group_members.collect(&:to_s).sort