[ARVADOS] updated: 2.1.0-860-ged4d8462e

[Git user]

Summary of changes:
 doc/install/salt-multi-host.html.textile.liquid      |  3 ++-
 .../multi_host/aws/states/host_entries.sls           |  8 +++++++-
 .../salt-install/local.params.example.multiple_hosts | 16 ++++++++++------
 tools/salt-install/provision.sh                      | 20 ++++++++++++--------
 4 files changed, 31 insertions(+), 16 deletions(-)

       via  ed4d8462e763eb1d8c8f1548912495563cd9288f (commit)
       via  0532a70b56f2e8d93bcf0db7e0f63f7104507c1c (commit)
       via  a766778e0f838f9713ec9f4eb048b80acf5cd97f (commit)
       via  ff5f0cdbc9f6861cde5836cdc53b662adda27271 (commit)
       via  35bf3afb8b312dcc30fe3b61042779d33bf1db10 (commit)
      from  431b8df752ca99dd8aa777864f7c5ada650d0ac9 (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 ed4d8462e763eb1d8c8f1548912495563cd9288f
Merge: 431b8df75 0532a70b5
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Fri May 28 18:21:50 2021 -0300

    Merge branch '17603-nginx-webshell-vhost-fix'
    
    closes #17603
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --cc tools/salt-install/provision.sh
index dd03a8f74,89616528d..49c817d90
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@@ -444,17 -424,16 +446,20 @@@ els
          grep -q "nginx_passenger" ${P_DIR}/top.sls          || echo "    - nginx_passenger" >> ${P_DIR}/top.sls
          grep -q "nginx_${R}_configuration" ${P_DIR}/top.sls || echo "    - nginx_${R}_configuration" >> ${P_DIR}/top.sls
        ;;
-       "controller" | "websocket" | "workbench" | "workbench2" | "keepweb" | "keepproxy")
+       "controller" | "websocket" | "workbench" | "workbench2" | "webshell" | "keepweb" | "keepproxy")
          # States
          grep -q "nginx.passenger" ${S_DIR}/top.sls || echo "    - nginx.passenger" >> ${S_DIR}/top.sls
 +        # Currently, only available on config_examples/multi_host/aws
          if [ "x${USE_LETSENCRYPT}" = "xyes" ]; then
 -          grep -q "letsencrypt" ${S_DIR}/top.sls || echo "    - letsencrypt" >> ${S_DIR}/top.sls
 +          if [ "x${USE_LETSENCRYPT_IAM_USER}" = "xyes" ]; then
 +            grep -q "aws_credentials" ${S_DIR}/top.sls || echo "    - aws_credentials" >> ${S_DIR}/top.sls
 +          fi
 +          grep -q "letsencrypt"     ${S_DIR}/top.sls || echo "    - letsencrypt" >> ${S_DIR}/top.sls
          fi
-         grep -q "arvados.${R}" ${S_DIR}/top.sls    || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
+         # webshell role is just a nginx vhost, so it has no state
+         if [ "${R}" != "webshell" ]; then
+           grep -q "arvados.${R}" ${S_DIR}/top.sls    || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
+         fi
          # Pillars
          grep -q "nginx_passenger" ${P_DIR}/top.sls          || echo "    - nginx_passenger" >> ${P_DIR}/top.sls
          grep -q "nginx_${R}_configuration" ${P_DIR}/top.sls || echo "    - nginx_${R}_configuration" >> ${P_DIR}/top.sls

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


hooks/post-receive
--