[ARVADOS] updated: 2.1.0-183-g050106662

[Git user]

Summary of changes:
 .gitignore                                                        | 2 ++
 tools/salt-install/provision.sh                                   | 2 +-
 tools/salt-install/single_host/nginx_workbench2_configuration.sls | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

       via  050106662d06b96996e4c33ea3e896bc154783c8 (commit)
      from  e58d099d4a0fd73e413c4bb5229dd6069d4c1288 (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 050106662d06b96996e4c33ea3e896bc154783c8
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Mon Dec 7 09:20:29 2020 -0300

    fix(provision): add port to workbench2 nginx's stanza
    
    refs #17177
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/.gitignore b/.gitignore
index 877ccdf4d..beb84b3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ services/api/config/arvados-clients.yml
 .Rproj.user
 _version.py
 *.bak
+arvados-snakeoil-ca.pem
+.vagrant
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 82a0a4a93..3fa233b61 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -190,7 +190,7 @@ EOFPSLS
 
 # Get the formula and dependencies
 cd ${F_DIR} || exit 1
-git clone https://github.com/saltstack-formulas/arvados-formula.git
+git clone https://github.com/netmanagers/arvados-formula.git
 git clone --branch "${DOCKER_TAG}" https://github.com/saltstack-formulas/docker-formula.git
 git clone --branch "${LOCALE_TAG}" https://github.com/saltstack-formulas/locale-formula.git
 git clone --branch "${NGINX_TAG}" https://github.com/saltstack-formulas/nginx-formula.git
diff --git a/tools/salt-install/single_host/nginx_workbench2_configuration.sls b/tools/salt-install/single_host/nginx_workbench2_configuration.sls
index d30b13382..8930be408 100644
--- a/tools/salt-install/single_host/nginx_workbench2_configuration.sls
+++ b/tools/salt-install/single_host/nginx_workbench2_configuration.sls
@@ -42,7 +42,7 @@ nginx:
               - 'if (-f $document_root/maintenance.html)':
                 - return: 503
             - location /config.json:
-              - return: {{ "200 '" ~ '{"API_HOST":"__CLUSTER__.__DOMAIN__"}' ~ "'" }}
+              - return: {{ "200 '" ~ '{"API_HOST":"__CLUSTER__.__DOMAIN__:__HOST_SSL_PORT__"}' ~ "'" }}
             - include: 'snippets/arvados-snakeoil.conf'
             - access_log: /var/log/nginx/workbench2.__CLUSTER__.__DOMAIN__.access.log combined
             - error_log: /var/log/nginx/workbench2.__CLUSTER__.__DOMAIN__.error.log

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


hooks/post-receive
--