[ARVADOS] updated: 2.1.0-2396-g99cb1578d

[Git user]

Summary of changes:
 .../config_examples/multi_host/aws/states/passenger_rvm.sls             | 2 +-
 .../single_host/multiple_hostnames/states/passenger_rvm.sls             | 2 +-
 .../single_host/single_hostname/states/passenger_rvm.sls                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  99cb1578d99ab1926010e0c5951b03da70ca1990 (commit)
      from  f959aac33c7f09df2975a81b8a1cd1eeeb38af6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 99cb1578d99ab1926010e0c5951b03da70ca1990
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Apr 29 14:55:04 2022 -0400

    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 at 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 cb6799f2d..cb4bc1a1f 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 cb6799f2d..cb4bc1a1f 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 cb6799f2d..cb4bc1a1f 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:

-----------------------------------------------------------------------


hooks/post-receive
--