[ARVADOS] updated: 0e140a472e787e6efa9a235bfdaa1e960e2aaa49

[git at public.curoverse.com]

Summary of changes:
 docker/README.md          |   33 ++++++++++++++++++++++++++++++++-
 docker/config.yml.example |    5 +++--
 2 files changed, 35 insertions(+), 3 deletions(-)

       via  0e140a472e787e6efa9a235bfdaa1e960e2aaa49 (commit)
      from  4d069ac2af110685fa13aef5a6cc1d2c090da2fc (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 0e140a472e787e6efa9a235bfdaa1e960e2aaa49
Author: Tim Pierce <twp at clinicalfuture.com>
Date:   Thu Dec 19 13:51:24 2013 -0500

    Updated documentation for clarity.

diff --git a/docker/README.md b/docker/README.md
index 48b255f..5ae3852 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -16,8 +16,39 @@ Prerequisites
 
   Docker is a Linux container management system based on LXC. It is a
   very young system but is being developed rapidly.
-  [Installation packages](http://www.docker.io/gettingstarted/#h_installation)
+  [Installation packages](http://www.docker.io/gettingstarted/)
   are available for several platforms.
+  
+  If a prebuilt docker package is not available for your platform, the
+  short instructions for installing it are:
+  
+  1. Create a `docker` group and add yourself to it.
+
+     <pre>
+     $ sudo addgroup docker
+     $ sudo adduser `whoami` docker
+     </pre>
+
+     Log out and back in.
+	 
+  2. Add a `cgroup` filesystem and mount it:
+
+     <pre>
+     $ mkdir -p /cgroup
+     $ grep cgroup /etc/fstab
+     none   /cgroup    cgroup    defaults    0    0
+     $ sudo mount /cgroup
+	 </pre>
+
+  3. Enable IPv4 forwarding:
+
+     <pre>
+     $ grep ipv4.ip_forward /etc/sysctl.conf
+     net.ipv4.ip_forward=1
+     $ sudo sysctl net.ipv4.ip_forward=1
+     </pre>
+	 
+  4. [Download and run a docker binary from docker.io.](http://docs.docker.io/en/latest/installation/binaries/)
 
 * Ruby (any version)
 
diff --git a/docker/config.yml.example b/docker/config.yml.example
index 137252b..6ada7f8 100644
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -44,12 +44,13 @@ ARVADOS_PROD_PW:
 # If a _SECRET variable is set to an empty string, a password
 # will be chosen randomly at build time. This is the
 # recommended setting.
+
+# The value for the Rails config.secret_token setting.
 API_SECRET:
 
 # A "superuser" token with which servers can authenticate to
 # the API server, before an administrative user has been created.
-# Necessary for bootstrapping, e.g. so Keep can register with
-# the API server before any users have been added.
+# Leave this blank to generate a secret randomly at build time (recommended).
 API_SUPERUSER_SECRET:
 
 # More than anything this should be auto-generated, but

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


hooks/post-receive
--