From d5bd87b8c7f1382e939ea5865f07e6a873ea9083 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 21 Jul 2021 18:38:35 -0300 Subject: [PATCH] 17750: set the ruby binary in passenger for Centos MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- test/salt/pillar/examples/nginx_passenger.sls | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls index 6bbd989..7091e28 100644 --- a/test/salt/pillar/examples/nginx_passenger.sls +++ b/test/salt/pillar/examples/nginx_passenger.sls @@ -6,9 +6,11 @@ {%- if grains.os_family in ('RedHat',) %} {%- set passenger_pkg = 'nginx-mod-http-passenger' %} {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' %} + {%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.5.8/bin/ruby' %} {%- else %} {%- set passenger_pkg = 'libnginx-mod-http-passenger' %} {%- set passenger_mod = '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} + {%- set passenger_ruby = '/usr/bin/ruby' %} {%- endif %} ### NGINX @@ -18,7 +20,7 @@ nginx: passenger_package: {{ passenger_pkg }} ### PASSENGER passenger: - passenger_ruby: /usr/local/rvm/rubies/ruby-2.5.8/bin/ruby + passenger_ruby: {{ passenger_ruby }} ### SERVER server: -- 2.30.2