X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/ad8af2094ca06d93dba1f61f3e96587b12e7f667..175f39d6b8ded81f9ba78f99700fee9d49275d21:/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 7091e28..63ca497 100644 --- a/test/salt/pillar/examples/nginx_passenger.sls +++ b/test/salt/pillar/examples/nginx_passenger.sls @@ -3,15 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 -{%- 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 %} +{%- set passenger_pkg = 'nginx-mod-http-passenger' + if grains.osfinger in ('CentOS Linux-7') else + 'libnginx-mod-http-passenger' %} +{%- 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' + if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04',) else + '/usr/bin/ruby' %} ### NGINX nginx: