[arvados] updated: 2.1.0-2942-g8ed7c8899

[git repository hosting]

Summary of changes:
 doc/_includes/_download_installer.liquid         | 3 ++-
 doc/install/salt-single-host.html.textile.liquid | 6 +++---
 tools/salt-install/installer.sh                  | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

       via  8ed7c88997b2f9fb66e3779b0d53cccc918e5ff0 (commit)
      from  8e657ade7a2c4881756064c5810d9946f61f5353 (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 8ed7c88997b2f9fb66e3779b0d53cccc918e5ff0
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 30 16:04:26 2022 -0400

    19215: Tweak a few things from initial testing
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/_includes/_download_installer.liquid b/doc/_includes/_download_installer.liquid
index 10909088b..280308beb 100644
--- a/doc/_includes/_download_installer.liquid
+++ b/doc/_includes/_download_installer.liquid
@@ -10,8 +10,9 @@ This is a package-based installation method, however the installation script is
 
 <notextile>
 <pre><code>git clone https://git.arvados.org/arvados.git
+cd arvados
 git checkout {{ branchname }}
-cd arvados/tools/salt-install
+cd tools/salt-install
 </code></pre>
 </notextile>
 
diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid
index 044dd5f14..9c3670a96 100644
--- a/doc/install/salt-single-host.html.textile.liquid
+++ b/doc/install/salt-single-host.html.textile.liquid
@@ -83,7 +83,7 @@ This is described in more detail in "DNS entries and TLS certificates":install-m
 
 h3. Additional prerequisites
 
-# Passwordless @sudo@ access on the account where you are doing the install
+# root or passwordless @sudo@ access on the account where you are doing the install
 this usually means adding the account to the @sudo@ group and having a rule like this in @/etc/sudoers.d/arvados_passwordless@ that allows members of group @sudo@ to execute any command without entering a password.
 <pre>%sudo all=(all:all) nopasswd:all</pre>
 # @git@ installed on the machine
@@ -94,8 +94,8 @@ this usually means adding the account to the @sudo@ group and having a rule like
 
 h2(#download). Download the installer
 
-{% assign local_params_src = single_host_single_hostname' %}
-{% assign config_examples_src = 'single_host/single_hostname'%}
+{% assign local_params_src = 'single_host_single_hostname' %}
+{% assign config_examples_src = 'single_host/single_hostname' %}
 {% include 'download_installer' %}
 
 If you are using multiple hostname configuration, substitute 'multiple_hostnames' where it says 'single_hostname' in the command above.
diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 91ade4212..2b576893a 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -93,7 +93,11 @@ deploynode() {
     logfile=deploy-${NODE}-$(date -Iseconds).log
 
     if [[ "$NODE" = localhost ]] ; then
-	sudo ./provision.sh --config ${CONFIG_FILE} --roles ${ROLES} 2>&1 | tee $logfile
+	SUDO=''
+	if [[ $(whoami) != 'root' ]] ; then
+	    SUDO=sudo
+	fi
+	$SUDO ./provision.sh --config ${CONFIG_FILE} --roles ${ROLES} 2>&1 | tee $logfile
     else
 	ssh $DEPLOY_USER@$NODE "cd ${GITTARGET} && sudo ./provision.sh --config ${CONFIG_FILE} --roles ${ROLES}" 2>&1 | tee $logfile
     fi

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


hooks/post-receive
--