X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/54c48370c355d1e490f779d3674828cbac103db5..9bca5f05185dde08efcf2d5f1a2bf66c8cdc9f00:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 13a6f9632..039f5b204 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.to_s}" + 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,64 +133,57 @@ 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" - site_aliases = details[:aliases] || [] rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org" - secret_key_base = details[:secret_key_base] || SecureRandom.base64(96) - node.set[:dev][:rails][name][:secret_key_base] = secret_key_base + if details[:repository] + site_aliases = details[:aliases] || [] + secret_key_base = details[:secret_key_base] || SecureRandom.base64(96) - postgresql_database database_name do - cluster "9.3/main" - owner "apis" - end + node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base - postgresql_extension "#{database_name}_btree_gist" do - cluster "9.3/main" - database database_name - extension "btree_gist" - end - - rails_port site_name do - ruby node[:passenger][:ruby_version] - directory rails_directory - user "apis" - group "apis" - repository details[:repository] - revision details[:revision] - database_port node[:postgresql][:clusters][:"9.3/main"][:port] - database_name database_name - database_username "apis" - run_migrations true - end - - template "#{rails_directory}/config/initializers/setup.rb" do - source "rails.setup.rb.erb" - owner "apis" - group "apis" - mode 0644 - variables :site => site_name - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" - end + postgresql_database database_name do + cluster "9.3/main" + owner "apis" + end - apache_site site_name do - template "apache.rails.erb" - variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base - end - end + postgresql_extension "#{database_name}_btree_gist" do + cluster "9.3/main" + database database_name + extension "btree_gist" + end - Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |rails_directory| - name = File.basename(rails_directory, ".apis.dev.openstreetmap.org") + rails_port site_name do + ruby node[:passenger][:ruby_version] + directory rails_directory + user "apis" + group "apis" + repository details[:repository] + revision details[:revision] + database_port node[:postgresql][:clusters][:"9.3/main"][:port] + database_name database_name + database_username "apis" + run_migrations true + end - unless node[:dev][:rails].include?(name) and node[:dev][:rails][name].include?(:repository) - database_config = YAML.load_file("#{rails_directory}/config/database.yml") - database_name = database_config["production"]["database"] - site_name = "#{name}.apis.dev.openstreetmap.org" + template "#{rails_directory}/config/initializers/setup.rb" do + source "rails.setup.rb.erb" + owner "apis" + group "apis" + mode 0644 + variables :site => site_name + notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" + end apache_site site_name do - action [ :delete ] + template "apache.rails.erb" + variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base + end + else + apache_site site_name do + action [:delete] end directory rails_directory do @@ -206,7 +200,7 @@ if node[:postgresql][:clusters][:"9.1/main"] cluster "9.3/main" end - node[:dev][:rails][name].delete(:secret_key_base) + node.normal[:dev][:rails].delete(name) end end @@ -227,7 +221,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"