From 050106662d06b96996e4c33ea3e896bc154783c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 7 Dec 2020 09:20:29 -0300 Subject: [PATCH] fix(provision): add port to workbench2 nginx's stanza MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit refs #17177 Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .gitignore | 2 ++ tools/salt-install/provision.sh | 2 +- .../salt-install/single_host/nginx_workbench2_configuration.sls | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 877ccdf4df..beb84b3c20 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 82a0a4a934..3fa233b61f 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 d30b133828..8930be408c 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 -- 2.30.2