[ARVADOS] updated: 2.1.0-471-g675a683db
Git user
git at public.arvados.org
Tue Apr 13 19:24:08 UTC 2021
Summary of changes:
doc/install/salt-multi-host.html.textile.liquid | 14 +++++++-------
doc/install/salt-single-host.html.textile.liquid | 4 ++--
.../local.params.example.single_host_multiple_hostnames | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
via 675a683db2d878c5336f9f8c21d91e79dfe7a57e (commit)
from dde8a2e6ac2eba20a45b85d556f53c8f0ef201c7 (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 675a683db2d878c5336f9f8c21d91e79dfe7a57e
Author: Javier Bértoli <jbertoli at curii.com>
Date: Tue Apr 13 16:23:17 2021 -0300
fix(provision): use nginx-formula PR branch until changes are merged
refs #17246
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 8011876a6..bb8cd0bdf 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 at host:
-ssh user at host sudo provision.sh --roles comma,separated,list,of,roles,to,apply
+ssh user at 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 at host:
-ssh user at host sudo provision.sh --config local.params --roles database
+ssh user at host sudo ./provision.sh --config local.params --roles database
</code></pre>
</notextile>
#. API
<notextile>
<pre><code>scp -r provision.sh local* user at host:
-ssh user at host sudo provision.sh --config local.params --roles api,controller,websocket,dispatcher
+ssh user at 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 at host:
-ssh user at host sudo provision.sh --config local.params --roles keepstore
+ssh user at host sudo ./provision.sh --config local.params --roles keepstore
</code></pre>
</notextile>
#. Workbench
<notextile>
<pre><code>scp -r provision.sh local* user at host:
-ssh user at host sudo provision.sh --config local.params --roles workbench,workbench2
+ssh user at host sudo ./provision.sh --config local.params --roles workbench,workbench2
</code></pre>
</notextile>
#. Keepproxy / Keepweb
<notextile>
<pre><code>scp -r provision.sh local* user at host:
-ssh user at host sudo provision.sh --config local.params --roles keepproxy,keepweb
+ssh user at host sudo ./provision.sh --config local.params --roles keepproxy,keepweb
</code></pre>
</notextile>
#. Shell
<notextile>
<pre><code>scp -r provision.sh local* user at host:
-ssh user at host sudo provision.sh --config local.params --roles shell
+ssh user at 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 e0c8682c9..8f9b00830 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 at host:
-ssh user at host sudo provision.sh
+ssh user at 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 at host:
-ssh user at host sudo provision.sh -c /path/to/your/local.params.file
+ssh user at 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 8d5438e8f..e64423aa8 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"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list