[ARVADOS] updated: f618b6517fff37194a1a4183a607658f46952732

[git at public.curoverse.com]

Summary of changes:
 .../install-crunch-dispatch.html.textile.liquid    | 36 +++++++++++-----------
 doc/install/install-keepproxy.html.textile.liquid  | 11 +++++--
 2 files changed, 26 insertions(+), 21 deletions(-)

       via  f618b6517fff37194a1a4183a607658f46952732 (commit)
       via  2d9cae58ae387d29d161ea96b6cd704d0764b1d8 (commit)
      from  e0213cbec6a151e077b8cca00700815c3c3d18e7 (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 f618b6517fff37194a1a4183a607658f46952732
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Aug 10 14:23:09 2015 -0400

    Improve crunch-dispatch runit script in install guide.
    
    * Modernize crunch-dispatch's prerequisites.
    * Document what this script is.
    * Consolidate environment variables for easier configuration.
    
    No issue #.

diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 2ed1f87..c3512fc 100644
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -149,37 +149,37 @@ Without getting this error:
 ArgumentError: Specified script_version does not resolve to a commit
 </pre>
 
-h2. Running jobs
+h2. Run the Crunch dispatcher service
 
-* @services/api/script/crunch-dispatch.rb@ must be running.
-* @crunch-dispatch.rb@ needs @services/crunch/crunch-job@ in its @PATH at .
+To dispatch Arvados jobs:
+
+* The API server script @crunch-dispatch.rb@ must be running.
 * @crunch-job@ needs the installation path of the Perl SDK in its @PERLLIB at .
-* @crunch-job@ needs the @ARVADOS_API_HOST@ (and, if necessary in a development environment, @ARVADOS_API_HOST_INSECURE@) environment variable set.
+* @crunch-job@ needs the @ARVADOS_API_HOST@ (and, if necessary, @ARVADOS_API_HOST_INSECURE@) environment variable set.
 
-Example @/var/service/arvados_crunch_dispatch/run@ script:
+We recommend you run @crunch-dispatch.rb@ under "runit":http://smarden.org/runit/ or a similar supervisor.  Here's an example runit service script:
 
-<pre>
-#!/bin/sh
+<notextile>
+<pre><code>#!/bin/sh
 set -e
 
 rvmexec=""
-## uncomment this line if you use rvm:
+## Uncomment this line if you use RVM:
 #rvmexec="/usr/local/rvm/bin/rvm-exec default"
 
-export PATH="$PATH":/path/to/arvados/services/crunch
-export ARVADOS_API_HOST={{ site.arvados_api_host }}
+export ARVADOS_API_HOST=<span class="userinput">uuid_prefix.your.domain</span>
 export CRUNCH_DISPATCH_LOCKFILE=/var/lock/crunch-dispatch
+export RAILS_ENV=production
+
+## Uncomment this line if your cluster uses self-signed SSL certificates:
+#export ARVADOS_API_HOST_INSECURE=yes
 
 # This is the path to docker on your compute nodes. You might need to
 # change it to "docker", "/opt/bin/docker", etc.
-export CRUNCH_JOB_DOCKER_BIN=docker.io
+export CRUNCH_JOB_DOCKER_BIN=<span class="userinput">docker.io</span>
 
 fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
-
-## Only if your SSL cert is unverifiable:
-# export ARVADOS_API_HOST_INSECURE=yes
-
-cd /path/to/arvados/services/api
-export RAILS_ENV=production
+cd /var/www/arvados-api/services/api
 exec $rvmexec bundle exec ./script/crunch-dispatch.rb 2>&1
-</pre>
+</code></pre>
+</notextile>

commit 2d9cae58ae387d29d161ea96b6cd704d0764b1d8
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Aug 10 14:17:59 2015 -0400

    Include example service script for keepproxy.
    
    Conveniently you just need this one line, which should work equally
    well in all kinds of supervisors.  No issue #.

diff --git a/doc/install/install-keepproxy.html.textile.liquid b/doc/install/install-keepproxy.html.textile.liquid
index bbbec23..f46e650 100644
--- a/doc/install/install-keepproxy.html.textile.liquid
+++ b/doc/install/install-keepproxy.html.textile.liquid
@@ -45,8 +45,6 @@ Usage of default:
 </code></pre>
 </notextile>
 
-It's recommended to run Keepproxy under "runit":http://smarden.org/runit/ or something similar.
-
 h3. Create an API token for the Keepproxy server
 
 The Keepproxy server needs a token to talk to the API server.
@@ -58,7 +56,14 @@ On the <strong>API server</strong>, use the following command to create the toke
 hoShoomoo2bai3Ju1xahg6aeng1siquuaZ1yae2gi2Uhaeng2r
 </code></pre></notextile>
 
-The value for the @api_token@ field should be added to Keepproxy's environment as ARVADOS_API_TOKEN. Make sure to also set ARVADOS_API_HOST to @uuid_prefix at .your.domain.
+h3. Set up the Keepproxy service
+
+We recommend you run Keepproxy under "runit":http://smarden.org/runit/ or a similar supervisor.  Make sure the launcher sets the envirnoment variables @ARVADOS_API_TOKEN@ (with the token you just generated), @ARVADOS_API_HOST@, and, if needed, @ARVADOS_API_HOST_INSECURE at .  The core keepproxy command to run is:
+
+<notextile>
+<pre><code>ARVADOS_API_TOKEN=<span class="userinput">[generated token]</span> ARVADOS_API_HOST=<span class="userinput">uuid_prefix.your.domain</span> exec keepproxy
+</code></pre>
+</notextile>
 
 h3. Set up a reverse proxy with SSL support
 

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


hooks/post-receive
--