4042: another expand fix

[arvados.git] / doc / install / create-standard-objects.html.textile.liquid

diff --git a/doc/install/create-standard-objects.html.textile.liquid b/doc/install/create-standard-objects.html.textile.liquid
index 678127bbfad97fbb0b90e9e7e725746d2042b9c8..d6a091a41ff92db87491243edc70432130f26859 100644 (file)
--- a/doc/install/create-standard-objects.html.textile.liquid
+++ b/doc/install/create-standard-objects.html.textile.liquid
@@ -12,7 +12,11 @@ h3. "All users" group
 The convention is to add every active user to this group. We give it a distinctive UUID that looks like an IP broadcast address.
 
 <pre>
-prefix=`arv user current | cut -d- -f1`
+prefix=`arv --format=uuid user current | cut -d- -f1`
+
+echo "Site prefix is '$prefix'"
+# (Make sure it matches your configured 5-character site prefix.)
+
 read -rd $'\000' newgroup <<EOF; arv group create --group "$newgroup"
 {
  "uuid":"$prefix-j7d0g-fffffffffffffff",
@@ -23,19 +27,21 @@ EOF
 
 h3. "arvados" repository
 
-This will be readable by the "All users" group, and therefore by every active user. This makes it possible for users to run the bundled Crunch scripts by specifying a commit like "arvados:HEAD", rather than having to pull the Arvados git tree into their own repositories.
+This will be readable by the "All users" group, and therefore by every active user. This makes it possible for users to run the bundled Crunch scripts by specifying @"script_version":"master","repository":"arvados"@ rather than pulling the Arvados source tree into their own repositories.
 
 <pre>
-prefix=`arv user current | cut -d- -f1`
+prefix=`arv --format=uuid user current | cut -d- -f1`
+
+echo "Site prefix is '$prefix'"
+# (Make sure it matches your configured 5-character site prefix.)
+
 all_users_group_uuid="$prefix-j7d0g-fffffffffffffff"
-repo_uuid=`arv repository create --repository '{"name":"arvados"}'`
-echo "Arvados repository uuid is $repo_uuid"
+repo_uuid=`arv --format=uuid repository create --repository '{"name":"arvados"}'`
+echo "Arvados repository uuid is '$repo_uuid'"
 
 read -rd $'\000' newlink <<EOF; arv link create --link "$newlink" 
 {
- "tail_kind":"arvados#group",
  "tail_uuid":"$all_users_group_uuid",
- "head_kind":"arvados#repository",
  "head_uuid":"$repo_uuid",
  "link_class":"permission",
  "name":"can_read" 
@@ -45,16 +51,21 @@ EOF
 
 h3. Keep disks
 
-Currently, you need to tell Arvados about Keep disks manually.
+Currently, you need to tell Arvados about Keep services manually. You'll need at least two "disk" services.
+
+Example:
 
 <pre>
-secret=`ruby -e 'print rand(2**512).to_s(36)[0..49]'`
-arv keep_disk create --keep-disk <<EOF
+prefix=`arv --format=uuid user current | cut -d- -f1`
+echo "Site prefix is '$prefix'"
+# (Make sure it matches your configured 5-character site prefix.)
+
+read -rd $'\000' keepservice <<EOF; arv keep_service create --keep-service "$keepservice"
 {
- "service_host":"keep0.xyzzy.arvadosapi.com",
+ "service_host":"keep0.$prefix.arvadosapi.com",
  "service_port":25107,
  "service_ssl_flag":false,
- "ping_secret":"$secret"
+ "service_type":"disk"
 }
 EOF
 </pre>