X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0c4675f3d9cf77d932809778a11e273a07a0282e..cad29d0634cd10b0ee94e5e4974210e0ca01ae6f:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index d7d88656a..d623d05ff 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 @@ -70,6 +71,7 @@ package %w[ libpqxx-dev libcrypto++-dev libyajl-dev + libfmt-dev zlib1g-dev ] @@ -215,14 +217,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 rails jobs:work" restart "on-failure" private_tmp true private_devices true @@ -307,7 +307,6 @@ if node[:postgresql][:clusters][:"14/main"] end rails_port site_name do - ruby ruby_version directory rails_directory user "apis" group "apis" @@ -438,6 +437,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