14287: Merge branch 'master'

[arvados.git] / doc / install / install-keepstore.html.textile.liquid

diff --git a/doc/install/install-keepstore.html.textile.liquid b/doc/install/install-keepstore.html.textile.liquid
index 64a710f9126fe7aa905817b3fb1fae162407a603..5044cc0c21596c6ee577eb6011e1f901cc82c0a5 100644 (file)
--- a/doc/install/install-keepstore.html.textile.liquid
+++ b/doc/install/install-keepstore.html.textile.liquid
@@ -88,9 +88,9 @@ Listen: :25107
 # Format of request/response and error logs: "json" or "text".
 LogFormat: json
 
 # Format of request/response and error logs: "json" or "text".
 LogFormat: json
 

-# The secret key that must be provided by monitoring services
-# wishing to access the health check endpoint (/_health).
-ManagementToken: ""
+# The secret key that must be provided by monitoring services when
+# using the health check and metrics endpoints (/_health, /metrics).
+ManagementToken: xyzzy

 
 # Maximum RAM to use for data buffers, given in multiples of block
 # size (64 MiB). When this limit is reached, HTTP requests requiring
 
 # Maximum RAM to use for data buffers, given in multiples of block
 # size (64 MiB). When this limit is reached, HTTP requests requiring


@@ -200,7 +200,7 @@ h3. Tell the API server about the Keepstore servers
 
 The API server needs to be informed about the presence of your Keepstore servers.
 
 
 The API server needs to be informed about the presence of your Keepstore servers.
 

-First, if you don't already have an admin token, create a superuser token:
+First, if you don't already have an admin token, create a superuser token.

 
 {% include 'create_superuser_token' %}
 
 
 {% include 'create_superuser_token' %}
 


@@ -214,8 +214,8 @@ export ARVADOS_API_TOKEN=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
 Use this command to register each keepstore server you have installed.  Make sure to update the @service_host@ value.
 
 <notextile>
 Use this command to register each keepstore server you have installed.  Make sure to update the @service_host@ value.
 
 <notextile>

-<pre><code>~$ <span class="userinput">prefix=`arv --format=uuid user current | cut -d- -f1`</span>
-~$ <span class="userinput">echo "Site prefix is '$prefix'"</span>
+<pre><code>~$ <span class="userinput">uuid_prefix=`arv --format=uuid user current | cut -d- -f1`</span>
+~$ <span class="userinput">echo "Site prefix is '$uuid_prefix'"</span>

 ~$ <span class="userinput">read -rd $'\000' keepservice &lt;&lt;EOF; arv keep_service create --keep-service "$keepservice"</span>
 <span class="userinput">{
  "service_host":"<strong>keep0.$uuid_prefix.your.domain</strong>",
 ~$ <span class="userinput">read -rd $'\000' keepservice &lt;&lt;EOF; arv keep_service create --keep-service "$keepservice"</span>
 <span class="userinput">{
  "service_host":"<strong>keep0.$uuid_prefix.your.domain</strong>",