X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b20599b6503be65674c3e420be6cca91b507ac0a..21958591555b0b80370e944e3128ac5d533c281d:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 1290e11f9..75dcefc8b 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 @@ -105,7 +105,7 @@ search(:accounts, "*:*").each do |account| details = node[:accounts][:users][name] || {} port = 7000 + account["uid"].to_i - if ["user","administrator"].include?(details[:status]) + if %w(user administrator).include?(details[:status]) user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" if File.directory?("#{user_home}/public_html") @@ -132,7 +132,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" @@ -182,7 +182,7 @@ if node[:postgresql][:clusters][:"9.1/main"] end else apache_site site_name do - action [ :delete ] + action [:delete] end directory rails_directory do