X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4d71f2663048f32430d74b4ce13ad42de80555bb..ff044920428608b2c04507ad52d6ab52c9d6555f:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index d660718e6..1290e11f9 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -106,7 +106,7 @@ search(:accounts, "*:*").each do |account| port = 7000 + account["uid"].to_i if ["user","administrator"].include?(details[:status]) - user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}" + user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" if File.directory?("#{user_home}/public_html") template "/etc/php5/fpm/pool.d/#{name}.conf" do @@ -220,7 +220,7 @@ if node[:postgresql][:clusters][:"9.1/main"] template "apache.apis.erb" end - node[:postgresql][:clusters].each do |name,details| + node[:postgresql][:clusters].each_key do |name| postgresql_munin name do cluster name database "ALL"