From 3d76d16c84d60978f9c9006b1e0a5b165f783170 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 25 May 2022 16:03:14 -0400 Subject: [PATCH] Provision scripts: do not hardcode a ruby version when using RVM, use the generic wrapper instead. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- .../config_examples/multi_host/aws/pillars/nginx_passenger.sls | 2 +- .../single_host/multiple_hostnames/pillars/nginx_passenger.sls | 2 +- .../single_host/single_hostname/pillars/nginx_passenger.sls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls index 2b6b96c3a4..c14fbd1f59 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls @@ -9,7 +9,7 @@ {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' if grains.osfinger in ('CentOS Linux-7',) else '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} -{%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby' +{%- set passenger_ruby = '/usr/local/rvm/wrappers/default/ruby' if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls index e51ec21eb9..dfddf3b623 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls @@ -9,7 +9,7 @@ {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' if grains.osfinger in ('CentOS Linux-7',) else '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} -{%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby' +{%- set passenger_ruby = '/usr/local/rvm/wrappers/default/ruby' if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls index 2b764eb2c2..21c1510de8 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls @@ -9,7 +9,7 @@ {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' if grains.osfinger in ('CentOS Linux-7',) else '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} -{%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby' +{%- set passenger_ruby = '/usr/local/rvm/wrappers/default/ruby' if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} -- 2.30.2