[ARVADOS] updated: 2.1.0-2394-g4b90c8422

[Git user]

Summary of changes:
 .../multi_host/aws/states/nginx_passenger_rvm.sls             | 11 ++++++++---
 .../multiple_hostnames/states/nginx_passenger_rvm.sls         | 11 ++++++++---
 .../single_hostname/states/nginx_passenger_rvm.sls            | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

       via  4b90c84229854200f7175d39f254d677af23e8b0 (commit)
      from  1b2b061a8cd0d91a838fbe12412c4e804fffb00f (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 4b90c84229854200f7175d39f254d677af23e8b0
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 27 18:23:25 2022 -0400

    19015: user fix for centos7
    
    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/nginx_passenger_rvm.sls b/tools/salt-install/config_examples/multi_host/aws/states/nginx_passenger_rvm.sls
index a033676cc..cb6799f2d 100644
--- a/tools/salt-install/config_examples/multi_host/aws/states/nginx_passenger_rvm.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/states/nginx_passenger_rvm.sls
@@ -2,14 +2,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+{%- if grains.os_family in ('RedHat',) %}
+  {%- set group = 'nginx' %}
+{%- else %}
+  {%- set group = 'www-data' %}
+{%- endif %}
+
 # Make sure that /var/www/.passenger exists with the proper ownership
 # so that passenger can build passenger_native_support.so
-
 extra_var_www_passenger:
   file.directory:
     - name: /var/www/.passenger
-    - user: www-data
-    - group: www-data
+    - user: {{ group }}
+    - group: {{ group }}
     - mode: '0755'
     - makedirs: True
 
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/nginx_passenger_rvm.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/nginx_passenger_rvm.sls
index a033676cc..cb6799f2d 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/nginx_passenger_rvm.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/nginx_passenger_rvm.sls
@@ -2,14 +2,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+{%- if grains.os_family in ('RedHat',) %}
+  {%- set group = 'nginx' %}
+{%- else %}
+  {%- set group = 'www-data' %}
+{%- endif %}
+
 # Make sure that /var/www/.passenger exists with the proper ownership
 # so that passenger can build passenger_native_support.so
-
 extra_var_www_passenger:
   file.directory:
     - name: /var/www/.passenger
-    - user: www-data
-    - group: www-data
+    - user: {{ group }}
+    - group: {{ group }}
     - mode: '0755'
     - makedirs: True
 
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/nginx_passenger_rvm.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/nginx_passenger_rvm.sls
index a033676cc..cb6799f2d 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/states/nginx_passenger_rvm.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/nginx_passenger_rvm.sls
@@ -2,14 +2,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+{%- if grains.os_family in ('RedHat',) %}
+  {%- set group = 'nginx' %}
+{%- else %}
+  {%- set group = 'www-data' %}
+{%- endif %}
+
 # Make sure that /var/www/.passenger exists with the proper ownership
 # so that passenger can build passenger_native_support.so
-
 extra_var_www_passenger:
   file.directory:
     - name: /var/www/.passenger
-    - user: www-data
-    - group: www-data
+    - user: {{ group }}
+    - group: {{ group }}
     - mode: '0755'
     - makedirs: True
 

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


hooks/post-receive
--