X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/307adfed3045a1673b09bccce74acaaf530d3c9b..8df838bf09d95282ba29ddde8b504e0affc5f06e:/cookbooks/accounts/recipes/default.rb diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb index d6c7806fd..76c3a8460 100644 --- a/cookbooks/accounts/recipes/default.rb +++ b/cookbooks/accounts/recipes/default.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Cookbook Name:: accounts # Recipe:: default @@ -31,7 +30,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