Remove last traces of legacy certificate support

[chef.git] / cookbooks / accounts / recipes / default.rb

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index e043d9e3ed6c43fd894b712886be820897c7193e..c6424b3edf750269201e9439cdc6584310ed5d53 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -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}"
   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
 
 
     group_members = group_members.collect(&:to_s).sort
 


@@ -78,9 +78,7 @@ search(:accounts, "*:*").each do |account|
       end
     end
 
       end
     end
 

-    if details[:status] == "administrator"
-      administrators.push(name.to_s)
-    end
+    administrators.push(name.to_s) if details[:status] == "administrator"

   else
     user name.to_s do
       action :remove
   else
     user name.to_s do
       action :remove