17750: set the ruby binary in passenger for Centos

[arvados-formula.git] / test / salt / pillar / examples / nginx_passenger.sls

diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls
index 8437d33986071a2d2f1daec379e446a2a8badf41..7091e28cc9da5818d4120118abc3cb1d2f2fe206 100644 (file)
--- 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:
@@ -60,8 +62,8 @@ nginx:
       # replace with the IP address of your resolver
       # - resolver: 127.0.0.1
 
-    ssl_snakeoil.conf:
-      - ssl_certificate: /etc/ssl/certs/arvados-snakeoil-cert.pem
+    arvados-snakeoil.conf:
+      - ssl_certificate: /etc/ssl/private/arvados-snakeoil-cert.pem
       - ssl_certificate_key: /etc/ssl/private/arvados-snakeoil-cert.key
 
   ### SITES