From: Javier Bértoli <jbertoli@curii.com>
Date: Wed, 21 Jul 2021 21:38:35 +0000 (-0300)
Subject: 17750: set the ruby binary in passenger for Centos
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/d5bd87b8c7f1382e939ea5865f07e6a873ea9083?hp=aea99ea5eafb8d2256a6441a72021eaf9db7cbb2

17750: set the ruby binary in passenger for Centos

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

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: