diff --git a/worker_host/travis_worker/metadata.rb b/worker_host/travis_worker/metadata.rb index ccbbfefda..44f433077 100644 --- a/worker_host/travis_worker/metadata.rb +++ b/worker_host/travis_worker/metadata.rb @@ -2,5 +2,5 @@ maintainer_email "mathias@travis-ci.org" license "Apache 2.0" description "Installs/Configures the Travis Worker" -version "0.5.0" +version "0.5.1" depends "runit" diff --git a/worker_host/travis_worker/recipes/bluebox.rb b/worker_host/travis_worker/recipes/bluebox.rb index cf2c577f9..b378eea1a 100644 --- a/worker_host/travis_worker/recipes/bluebox.rb +++ b/worker_host/travis_worker/recipes/bluebox.rb @@ -12,6 +12,17 @@ command "monit reload" end +package "ruby1.9.3" do + action :install +end + +cookbook_file "/usr/local/bin/signal_wrapper" do + source "signal_wrapper.rb" + mode "0755" + owner "root" + backup false +end + 1.upto(node[:travis][:worker][:workers]) do |worker| app = "worker-#{worker}" worker_name = "#{app}.#{node[:fqdn]}" diff --git a/worker_host/travis_worker/templates/default/sv-travis-worker-run.erb b/worker_host/travis_worker/templates/default/sv-travis-worker-run.erb index 72cd3a104..5b1f84c8f 100644 --- a/worker_host/travis_worker/templates/default/sv-travis-worker-run.erb +++ b/worker_host/travis_worker/templates/default/sv-travis-worker-run.erb @@ -1,4 +1,4 @@ #!/bin/bash exec 2>&1 cd <%= @options[:worker_home] %> -exec chpst -u <%= @options[:user] %>:<%= @options[:group] %> <%= @options[:jruby] %> ./bin/thor travis:worker:boot +exec chpst -u <%= @options[:user] %>:<%= @options[:group] %> /usr/local/bin/signal_wrapper <%= @options[:jruby] %> ./bin/thor travis:worker:boot