X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/fa49dbe833c7867ac95da84f9b36c8114cd89039..d5bd87b8c7f1382e939ea5865f07e6a873ea9083:/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 ec79746..7091e28 100644 --- a/test/salt/pillar/examples/nginx_passenger.sls +++ b/test/salt/pillar/examples/nginx_passenger.sls @@ -1,10 +1,16 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# 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 %} ### NGINX @@ -12,6 +18,10 @@ nginx: install_from_phusionpassenger: true lookup: passenger_package: {{ passenger_pkg }} + ### PASSENGER + passenger: + passenger_ruby: {{ passenger_ruby }} + ### SERVER server: config: @@ -52,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