X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/217064420664ee23151c357cf59a3ca0ce82c4cf..e847b156af79e857466b8ca0f51d68ef69a6dd01:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 5a4110c75..679ff6b4c 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -31,6 +31,7 @@ include_recipe "nodejs" include_recipe "php::fpm" include_recipe "postgresql" include_recipe "python" +include_recipe "ruby" package %w[ php-cgi @@ -215,14 +216,12 @@ if node[:postgresql][:clusters][:"14/main"] mode "755" end - ruby_version = node[:passenger][:ruby_version] - systemd_service "rails-jobs@" do description "Rails job queue runner" type "simple" user "apis" working_directory "/srv/%i.apis.dev.openstreetmap.org/rails" - exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work" + exec_start "#{node[:ruby][:bundle]} exec rake jobs:work" restart "on-failure" private_tmp true private_devices true @@ -248,6 +247,10 @@ if node[:postgresql][:clusters][:"14/main"] cgimap_port = 9000 + Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir| + node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {} + end + node[:dev][:rails].each do |name, details| database_name = details[:database] || "apis_#{name}" site_name = "#{name}.apis.dev.openstreetmap.org" @@ -303,7 +306,6 @@ if node[:postgresql][:clusters][:"14/main"] end rails_port site_name do - ruby ruby_version directory rails_directory user "apis" group "apis" @@ -434,6 +436,10 @@ if node[:postgresql][:clusters][:"14/main"] action :delete end + service "rails-jobs@#{name}" do + action [:stop, :disable] + end + directory site_directory do action :delete recursive true