X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b20599b6503be65674c3e420be6cca91b507ac0a..51096343cee85550cd197da1f8354f8407506af5:/cookbooks/dev/recipes/default.rb?ds=inline diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 1290e11f9..bca846b22 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -66,7 +66,7 @@ end service "php5-fpm" do provider Chef::Provider::Service::Upstart - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -103,27 +103,28 @@ end search(:accounts, "*:*").each do |account| name = account["id"] details = node[:accounts][:users][name] || {} - port = 7000 + account["uid"].to_i - if ["user","administrator"].include?(details[:status]) - user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" + next unless %w(user administrator).include?(details[:status]) - if File.directory?("#{user_home}/public_html") - template "/etc/php5/fpm/pool.d/#{name}.conf" do - source "fpm.conf.erb" - owner "root" - group "root" - mode 0644 - variables :user => name, :port => port - notifies :reload, "service[php5-fpm]" - end + user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" - apache_site "#{name}.dev.openstreetmap.org" do - template "apache.user.erb" - directory "#{user_home}/public_html" - variables :user => name, :port => port - end - end + next unless File.directory?("#{user_home}/public_html") + + port = 7000 + account["uid"].to_i + + template "/etc/php5/fpm/pool.d/#{name}.conf" do + source "fpm.conf.erb" + owner "root" + group "root" + mode 0644 + variables :user => name, :port => port + notifies :reload, "service[php5-fpm]" + end + + apache_site "#{name}.dev.openstreetmap.org" do + template "apache.user.erb" + directory "#{user_home}/public_html" + variables :user => name, :port => port end end @@ -132,7 +133,7 @@ if node[:postgresql][:clusters][:"9.1/main"] cluster "9.3/main" end - node[:dev][:rails].each do |name,details| + node[:dev][:rails].each do |name, details| database_name = details[:database] || "apis_#{name}" site_name = "#{name}.apis.dev.openstreetmap.org" rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org" @@ -173,7 +174,7 @@ if node[:postgresql][:clusters][:"9.1/main"] group "apis" mode 0644 variables :site => site_name - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" + notifies :run, "execute[#{rails_directory}]" end apache_site site_name do @@ -182,7 +183,7 @@ if node[:postgresql][:clusters][:"9.1/main"] end else apache_site site_name do - action [ :delete ] + action [:delete] end directory rails_directory do