From 26b79ef9f5a501421a5234a0edc6c8af108ca6cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 10 Mar 2022 20:49:33 -0300 Subject: [PATCH] 18849: enforce RVM on Debian 10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../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 28cc748dac..d9644e5645 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 @@ -10,7 +10,7 @@ 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' - if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04',) else + if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} ### NGINX 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 4ad14d33ff..886aab8764 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 @@ -10,7 +10,7 @@ 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' - if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04',) else + if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} ### NGINX 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 854c543aca..bce51f29e0 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 @@ -10,7 +10,7 @@ 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' - if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04',) else + if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} ### NGINX -- 2.30.2