Merge branch '17603-nginx-webshell-vhost-fix'

closes #17603
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --cc doc/install/salt-multi-host.html.textile.liquid
Simple merge

diff --cc tools/salt-install/local.params.example.multiple_hosts
Simple merge

diff --cc tools/salt-install/provision.sh
index dd03a8f749389484b74fedfb7c30277e36e0c609,89616528d61a1e5429dd8191daaf87f81fb3d14e..49c817d90f8b9699e78cfce5b4a0ffbd3f019cde
--- 1/tools/salt-install/provision.sh
--- 2/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