From 3b5a6405d3dd3483fa8d77fa4924138c6287d10b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 18 Jun 2013 19:49:13 +0100 Subject: [PATCH] Move account details to a data bag --- cookbooks/dev/recipes/default.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 33de91afb..39f99f6c7 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -103,9 +103,12 @@ apache_site "phppgadmin.dev.openstreetmap.org" do template "apache.phppgadmin.erb" end -node[:accounts][:users].each do |name,details| +search(:accounts, "*:*").each do |account| + name = account["id"] + details = node[:accounts][:users][name] + if ["user","administrator"].include?(details[:status]) - user_home = details[:home] || "#{node[:accounts][:home]}/#{name.to_s}" + user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}" if File.directory?("#{user_home}/public_html") template "/etc/php5/fpm/pool.d/#{name}.conf" do -- 2.43.2