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 cb6799f2d6cd9792c38b48b0318e0e05e67ad6be..cb4bc1a1f90bb7d5a82c89c87ae8a20d260be640 100644 (file)
--- 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=
     - 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:
   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 cb6799f2d6cd9792c38b48b0318e0e05e67ad6be..cb4bc1a1f90bb7d5a82c89c87ae8a20d260be640 100644 (file)
--- 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=
     - 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:
   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 cb6799f2d6cd9792c38b48b0318e0e05e67ad6be..cb4bc1a1f90bb7d5a82c89c87ae8a20d260be640 100644 (file)
--- 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=
     - 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:
   cmd.run:
     - name: systemctl daemon-reload
     - require: