From 569391c79c43224c3b4c58eef5fca56ed60267c4 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Thu, 19 Sep 2024 10:54:55 -0400 Subject: [PATCH] 22134: Define PATH in nginx+Passenger configuration RailsAPI needs this set to run `arvados-server`. To date this has been handled by the default `passenger_load_shell_envvars on`, which starts RailsAPI via `bash -l -c` to load environment variables from the shellrc files in /etc. However, this can fail due to system configuration changes, and we have seen Passenger try to start RailsAPI with an empty PATH after a server reload/restart. Defining PATH here should make the system more resilient against other system configuration changes. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- .../multi_host/aws/pillars/nginx_api_configuration.sls | 2 ++ .../multiple_hostnames/pillars/nginx_api_configuration.sls | 2 ++ .../single_hostname/pillars/nginx_api_configuration.sls | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_api_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_api_configuration.sls index d27552f6fb..e3c6d1fdbd 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_api_configuration.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_api_configuration.sls @@ -25,5 +25,7 @@ nginx: - access_log: /var/log/nginx/api.__DOMAIN__-upstream.access.log combined - error_log: /var/log/nginx/api.__DOMAIN__-upstream.error.log - passenger_enabled: 'on' + - passenger_env_var: "PATH /usr/bin:/usr/local/bin" + - passenger_load_shell_envvars: 'off' - passenger_preload_bundler: 'on' - client_max_body_size: 128m diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_api_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_api_configuration.sls index b567af90d7..e5c18de798 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_api_configuration.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_api_configuration.sls @@ -31,5 +31,7 @@ nginx: - access_log: /var/log/nginx/api.__CLUSTER__.__DOMAIN__-upstream.access.log combined - error_log: /var/log/nginx/api.__CLUSTER__.__DOMAIN__-upstream.error.log - passenger_enabled: 'on' + - passenger_env_var: "PATH /usr/bin:/usr/local/bin" + - passenger_load_shell_envvars: 'off' - passenger_preload_bundler: 'on' - client_max_body_size: 128m diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls index 3bf7bf54ab..254595ee74 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls @@ -31,5 +31,7 @@ nginx: - access_log: /var/log/nginx/api.__CLUSTER__.__DOMAIN__-upstream.access.log combined - error_log: /var/log/nginx/api.__CLUSTER__.__DOMAIN__-upstream.error.log - passenger_enabled: 'on' + - passenger_env_var: "PATH /usr/bin:/usr/local/bin" + - passenger_load_shell_envvars: 'off' - passenger_preload_bundler: 'on' - client_max_body_size: 128m -- 2.30.2