[ARVADOS] updated: 5f822d9281e5afea05b1c87e59740687c0ee6692

[git at public.curoverse.com]

Summary of changes:
 doc/_config.yml                                  | 2 +-
 doc/install/install-keep-web.html.textile.liquid | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

       via  5f822d9281e5afea05b1c87e59740687c0ee6692 (commit)
       via  831b63c1b17650fb28112360c5e123d91c7d546b (commit)
      from  3db04ce738a8e032eda2ebf8fe1acfa3ced41bbd (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 5f822d9281e5afea05b1c87e59740687c0ee6692
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Oct 19 15:19:02 2015 -0400

    5824: Leave "install keep-web" page out of install guide TOC for now.

diff --git a/doc/_config.yml b/doc/_config.yml
index d67668a..6d0bdb2 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -154,7 +154,7 @@ navbar:
       - install/create-standard-objects.html.textile.liquid
       - install/install-keepstore.html.textile.liquid
       - install/install-keepproxy.html.textile.liquid
-      - install/install-keep-web.html.textile.liquid
+      #- install/install-keep-web.html.textile.liquid
       - install/install-crunch-dispatch.html.textile.liquid
       - install/install-compute-node.html.textile.liquid
     - Helpful hints:

commit 831b63c1b17650fb28112360c5e123d91c7d546b
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Oct 19 13:22:53 2015 -0400

    5824: Fixup nginx and workbench configs

diff --git a/doc/install/install-keep-web.html.textile.liquid b/doc/install/install-keep-web.html.textile.liquid
index 9282a8e..4f2a129 100644
--- a/doc/install/install-keep-web.html.textile.liquid
+++ b/doc/install/install-keep-web.html.textile.liquid
@@ -90,6 +90,7 @@ server {
 
   location / {
     proxy_pass          http://keep-web;
+    proxy_set_header    Host            $host;
     proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
@@ -104,11 +105,11 @@ Configure your DNS servers so the following names resolve to your Nginx proxy's
 
 h3. Tell the API server about the keep-web service
 
-Add *one* of the following entries to your API server's @config/application.yml@ file, depending on your DNS setup:
+Add *one* of the following entries to your Workbench configuration file (@/etc/arvados/workbench/application.yml@), depending on your DNS setup:
 
 <notextile>
-<pre><code>keep-web: https://%{uuid_or_pdh}--dl.<span class="userinput">uuid_prefix</span>.your.domain
-keep-web: https://%{uuid_or_pdh}.dl.<span class="userinput">uuid_prefix</span>.your.domain
-keep-web: https://dl.<span class="userinput">uuid_prefix</span>.your.domain
+<pre><code>keep_web_url: https://%{uuid_or_pdh}--dl.<span class="userinput">uuid_prefix</span>.your.domain
+keep_web_url: https://%{uuid_or_pdh}.dl.<span class="userinput">uuid_prefix</span>.your.domain
+keep_web_url: https://dl.<span class="userinput">uuid_prefix</span>.your.domain
 </code></pre>
 </notextile>

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


hooks/post-receive
--