From: Ward Vandewege <ward@curii.com>
Date: Fri, 29 Apr 2022 18:55:04 +0000 (-0400)
Subject: 19015: update the nginx override so that systemd is happy even when RVM
X-Git-Tag: 2.5.0~187^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/99cb1578d99ab1926010e0c5951b03da70ca1990

19015: update the nginx override so that systemd is happy even when RVM
       is not installed. We don't install the override when RVM is not
       present, so this is a "just in case".

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/tools/salt-install/config_examples/multi_host/aws/states/passenger_rvm.sls b/tools/salt-install/config_examples/multi_host/aws/states/passenger_rvm.sls
index cb6799f2d6..cb4bc1a1f9 100644
--- a/tools/salt-install/config_examples/multi_host/aws/states/passenger_rvm.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/states/passenger_rvm.sls
@@ -32,7 +32,7 @@ extra_nginx_set_gem_home:
     - contents: |
         [Service]
         ExecStart=
-        ExecStart=/bin/bash -a -c "GEM_HOME=`/usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d=` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
+        ExecStart=/bin/bash -a -c "GEM_HOME=`[ -x /usr/local/rvm/bin/rvm-exec ] && /usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d= || true` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
   cmd.run:
     - name: systemctl daemon-reload
     - require:
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/passenger_rvm.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/passenger_rvm.sls
index cb6799f2d6..cb4bc1a1f9 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/passenger_rvm.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/passenger_rvm.sls
@@ -32,7 +32,7 @@ extra_nginx_set_gem_home:
     - contents: |
         [Service]
         ExecStart=
-        ExecStart=/bin/bash -a -c "GEM_HOME=`/usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d=` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
+        ExecStart=/bin/bash -a -c "GEM_HOME=`[ -x /usr/local/rvm/bin/rvm-exec ] && /usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d= || true` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
   cmd.run:
     - name: systemctl daemon-reload
     - require:
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/passenger_rvm.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/passenger_rvm.sls
index cb6799f2d6..cb4bc1a1f9 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/states/passenger_rvm.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/passenger_rvm.sls
@@ -32,7 +32,7 @@ extra_nginx_set_gem_home:
     - contents: |
         [Service]
         ExecStart=
-        ExecStart=/bin/bash -a -c "GEM_HOME=`/usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d=` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
+        ExecStart=/bin/bash -a -c "GEM_HOME=`[ -x /usr/local/rvm/bin/rvm-exec ] && /usr/local/rvm/bin/rvm-exec default env |grep GEM_HOME=|cut -f2 -d= || true` && /usr/sbin/nginx -g 'daemon on; master_process on;'"
   cmd.run:
     - name: systemctl daemon-reload
     - require: