[arvados] updated: 2.1.0-2953-g88556ba60

[git repository hosting]

Summary of changes:
 .../config_examples/single_host/single_hostname/pillars/arvados.sls     | 2 +-
 .../single_hostname/pillars/nginx_webshell_configuration.sls            | 2 +-
 tools/salt-install/provision.sh                                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  88556ba60c4e903669be229edd211c4bea3d587e (commit)
      from  ca44f3263c7ac7136fdcb5dae460e79fbb284a4b (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 88556ba60c4e903669be229edd211c4bea3d587e
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Oct 20 14:05:12 2022 -0300

    19215: Fixes webshell nginx config.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
index fc5b5a575..10a9b79c9 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
@@ -88,7 +88,7 @@ arvados:
     resources:
       virtual_machines:
         shell:
-          name: __HOSTNAME_EXT__
+          name: shell.__HOSTNAME_EXT__
           backend: 127.0.0.1
           port: 4200
 
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_webshell_configuration.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_webshell_configuration.sls
index 67013f93c..7a5b704e7 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_webshell_configuration.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_webshell_configuration.sls
@@ -28,7 +28,7 @@ nginx:
             - listen:
               - __WEBSHELL_EXT_SSL_PORT__ http2 ssl
             - index: index.html index.htm
-            - location /__HOSTNAME_EXT__:
+            - location /shell.__HOSTNAME_EXT__:
               - proxy_pass: 'http://webshell_upstream'
               - proxy_read_timeout: 90
               - proxy_connect_timeout: 90
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index f9566a03d..63e2d886a 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -631,7 +631,7 @@ if [ -z "${ROLES}" ]; then
     echo "extra_custom_certs_dir: /srv/salt/certs" > ${P_DIR}/extra_custom_certs.sls
     echo "extra_custom_certs:" >> ${P_DIR}/extra_custom_certs.sls
 
-    for c in controller websocket workbench workbench2 webshell keepweb keepproxy shell; do
+    for c in controller websocket workbench workbench2 webshell keepweb keepproxy; do
       # Are we in a single-host-single-hostname env?
       if [ "${USE_SINGLE_HOSTNAME}" = "yes" ]; then
         # Are we in a single-host-single-hostname env?

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


hooks/post-receive
--