[arvados] updated: 2.6.0-304-g73a972b5a

[git repository hosting]

Summary of changes:
 doc/install/salt-multi-host.html.textile.liquid  | 2 +-
 doc/install/salt-single-host.html.textile.liquid | 2 +-
 tools/salt-install/installer.sh                  | 2 +-
 tools/salt-install/provision.sh                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

       via  73a972b5affef724905e4ce4c4c916c48d145b34 (commit)
       via  36f5a68fd76e60f2cfdd0cf584d1d2de005e19ec (commit)
      from  db3234cd671649c92b25255a4268e1cc8bfd7809 (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 73a972b5affef724905e4ce4c4c916c48d145b34
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon Jun 26 12:52:56 2023 -0300

    20665: Provides examples on how to securely handle the secrets file.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index b0a3213d2..7403dacc2 100644
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -263,7 +263,7 @@ h2(#localparams). Edit @local.params*@ files
 
 The cluster configuration parameters are included in two files: @local.params@ and @local.params.secrets at . These files can be found wherever you choose to initialize the installation files (e.g., @~/setup-arvados-xarv1@ in these examples).
 
-The @local.params.secrets@ file is intended to store security-sensitive data such as passwords, private keys, tokens, etc. Depending on the security requirements of the cluster deployment, this file may need to be handled differently from the others.
+The @local.params.secrets@ file is intended to store security-sensitive data such as passwords, private keys, tokens, etc. Depending on the security requirements of the cluster deployment, you may wish to store this file in a secrets store like AWS secrets manager or Jenkins credentials.
 
 h3. Parameters from @local.params@:
 
diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid
index ec97be485..82a1137bc 100644
--- a/doc/install/salt-single-host.html.textile.liquid
+++ b/doc/install/salt-single-host.html.textile.liquid
@@ -108,7 +108,7 @@ h2(#localparams). Edit @local.params*@ files
 
 The cluster configuration parameters are included in two files: @local.params@ and @local.params.secrets at . These files can be found wherever you choose to initialize the installation files (e.g., @~/setup-arvados-xarv1@ in these examples).
 
-The @local.params.secrets@ file is intended to store security-sensitive data such as passwords, private keys, tokens, etc. Depending on the security requirements of the cluster deployment, this file may need to be handled differently from the others.
+The @local.params.secrets@ file is intended to store security-sensitive data such as passwords, private keys, tokens, etc. Depending on the security requirements of the cluster deployment, you may wish to store this file in a secrets store like AWS secrets manager or Jenkins credentials.
 
 h3. Parameters from @local.params@:
 

commit 36f5a68fd76e60f2cfdd0cf584d1d2de005e19ec
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon Jun 26 12:47:54 2023 -0300

    20665: Code style improvements.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 55cbd36d9..b042d1a83 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -127,7 +127,7 @@ deploynode() {
 }
 
 loadconfig() {
-    if [ ! -s ${CONFIG_FILE} -o ! -s ${CONFIG_FILE}.secrets ]; then
+    if [[ -s ${CONFIG_FILE} && -s ${CONFIG_FILE}.secrets ]]; then
 		echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi
     source ${CONFIG_FILE}.secrets
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index e438dfa77..3314d04ff 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -241,7 +241,7 @@ arguments ${@}
 
 declare -A NODES
 
-if [ -s ${CONFIG_FILE} -a -s ${CONFIG_FILE}.secrets ]; then
+if [[ -s ${CONFIG_FILE} && -s ${CONFIG_FILE}.secrets ]]; then
   source ${CONFIG_FILE}.secrets
   source ${CONFIG_FILE}
 else

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


hooks/post-receive
--