diff --git a/omnibus/cookbooks/firezone/recipes/phoenix.rb b/omnibus/cookbooks/firezone/recipes/phoenix.rb index 1e1043f59..b9b15d106 100644 --- a/omnibus/cookbooks/firezone/recipes/phoenix.rb +++ b/omnibus/cookbooks/firezone/recipes/phoenix.rb @@ -51,7 +51,6 @@ end if node['firezone']['phoenix']['enable'] component_runit_service 'phoenix' do package 'firezone' - control ['t'] action :enable subscribes :restart, 'file[environment-variables]' end diff --git a/omnibus/cookbooks/firezone/templates/sv-phoenix-t.erb b/omnibus/cookbooks/firezone/templates/sv-phoenix-t.erb deleted file mode 100644 index 7fb09d8b2..000000000 --- a/omnibus/cookbooks/firezone/templates/sv-phoenix-t.erb +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -echo "received TERM from runit, sending to process group (-PID)" -pid=$(<%= node['firezone']['app_directory'] %>/bin/firezone pid) -kill -- -$pid diff --git a/rel/env.sh.eex b/rel/env.sh.eex index d8ae8cf2c..86e387fb2 100644 --- a/rel/env.sh.eex +++ b/rel/env.sh.eex @@ -16,3 +16,8 @@ # RELEASE_DISTRIBUTION variable below. Must be "sname", "name" or "none". export RELEASE_DISTRIBUTION=name export RELEASE_NODE=<%= @release.name %>@127.0.0.1 + +# Choices here are 'interactive' and 'embedded'. 'interactive' boots faster which +# prevents some runit process management edge cases at the expense of the application +# not technically being ready to serve requests "right away". This is a useful tradeoff. +export RELEASE_MODE=interactive