From: Javier Bértoli <jbertoli@curii.com>
Date: Tue, 13 Apr 2021 19:23:17 +0000 (-0300)
Subject: fix(provision): use nginx-formula PR branch until changes are merged
X-Git-Tag: 2.2.0~65^2~17
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/675a683db2d878c5336f9f8c21d91e79dfe7a57e

fix(provision): use nginx-formula PR branch until changes are merged

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

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 8011876a61..bb8cd0bdf4 100644
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -105,7 +105,7 @@ When you finished customizing the configuration, you are ready to copy the files
 
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --roles comma,separated,list,of,roles,to,apply
+ssh user@host sudo ./provision.sh --roles comma,separated,list,of,roles,to,apply
 </code></pre>
 </notextile>
 
@@ -124,42 +124,42 @@ The distribution of role as described above can be applied running these command
 #. Database
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles database
+ssh user@host sudo ./provision.sh --config local.params --roles database
 </code></pre>
 </notextile>
 
 #. API
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles api,controller,websocket,dispatcher
+ssh user@host sudo ./provision.sh --config local.params --roles api,controller,websocket,dispatcher
 </code></pre>
 </notextile>
 
 #. Keepstore/s
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles keepstore
+ssh user@host sudo ./provision.sh --config local.params --roles keepstore
 </code></pre>
 </notextile>
 
 #. Workbench
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles workbench,workbench2
+ssh user@host sudo ./provision.sh --config local.params --roles workbench,workbench2
 </code></pre>
 </notextile>
 
 #. Keepproxy / Keepweb
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles keepproxy,keepweb
+ssh user@host sudo ./provision.sh --config local.params --roles keepproxy,keepweb
 </code></pre>
 </notextile>
 
 #. Shell
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh --config local.params --roles shell
+ssh user@host sudo ./provision.sh --config local.params --roles shell
 </code></pre>
 </notextile>
 
diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid
index e0c8682c9f..8f9b00830d 100644
--- a/doc/install/salt-single-host.html.textile.liquid
+++ b/doc/install/salt-single-host.html.textile.liquid
@@ -70,7 +70,7 @@ When you finished customizing the configuration, you are ready to copy the files
 
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh
+ssh user@host sudo ./provision.sh
 </code></pre>
 </notextile>
 
@@ -78,7 +78,7 @@ or, if you saved the @local.params@ in another directory or with some other name
 
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
-ssh user@host sudo provision.sh -c /path/to/your/local.params.file
+ssh user@host sudo ./provision.sh -c /path/to/your/local.params.file
 </code></pre>
 </notextile>
 
diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames
index 8d5438e8f6..e64423aa86 100644
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -82,7 +82,7 @@ BRANCH="master"
 # Formulas versions
 ARVADOS_TAG="v1.1.4"
 POSTGRES_TAG="v0.41.6"
-NGINX_TAG="v2.5.0"
+NGINX_TAG="master"
 DOCKER_TAG="v1.0.0"
 LOCALE_TAG="v0.3.4"
 LETSENCRYPT_TAG="v2.1.0"