[ARVADOS] updated: 7bf5f28cec1ff7be1e66925c3815c253989f9eb1

[git at public.curoverse.com]

Summary of changes:
 doc/install/install-keep-web.html.textile.liquid | 4 ++++
 services/keep-web/anonymous.go                   | 2 +-
 services/keep-web/doc.go                         | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

       via  7bf5f28cec1ff7be1e66925c3815c253989f9eb1 (commit)
      from  87640a81e725d0246837994acbb3a696d14401c6 (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 7bf5f28cec1ff7be1e66925c3815c253989f9eb1
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Oct 30 15:57:44 2015 -0400

    5824: Mention -anonymous-token in godoc. Sync usage messages.

diff --git a/doc/install/install-keep-web.html.textile.liquid b/doc/install/install-keep-web.html.textile.liquid
index 08e7af2..0a00ca8 100644
--- a/doc/install/install-keep-web.html.textile.liquid
+++ b/doc/install/install-keep-web.html.textile.liquid
@@ -40,6 +40,10 @@ Usage of keep-web:
         Address to listen on: "host:port", or ":port" to listen on all interfaces. (default ":80")
   -anonymous-token value
         API token to try when none of the tokens provided in an HTTP request succeed in reading the desired collection. If this flag is used more than once, each token will be attempted in turn until one works. (default [])
+  -attachment-only-host string
+        Accept credentials, and add "Content-Disposition: attachment" response headers, for requests at this hostname:port. Prohibiting inline display makes it possible to serve untrusted and non-public content from a single origin, i.e., without wildcard DNS or SSL.
+  -trust-all-content
+        Serve non-public content from a single origin. Dangerous: read docs before using!
 </code></pre>
 </notextile>
 
diff --git a/services/keep-web/anonymous.go b/services/keep-web/anonymous.go
index db40241..85ea1c6 100644
--- a/services/keep-web/anonymous.go
+++ b/services/keep-web/anonymous.go
@@ -20,5 +20,5 @@ func (ts *tokenSet) String() string {
 
 func init() {
 	flag.Var(&anonymousTokens, "anonymous-token",
-		"Try using the specified token when a client does not provide a valid token. If this flag is used multiple times, each token will be tried in turn until one works.")
+		"API token to try when none of the tokens provided in an HTTP request succeed in reading the desired collection. If this flag is used more than once, each token will be attempted in turn until one works.")
 }
diff --git a/services/keep-web/doc.go b/services/keep-web/doc.go
index 7e0a00f..2ebda6e 100644
--- a/services/keep-web/doc.go
+++ b/services/keep-web/doc.go
@@ -46,6 +46,15 @@
 // proxy. However, TLS is not used between nginx and keep-web, so
 // intervening networks must be secured by other means.
 //
+// Anonymous downloads
+//
+// Use the -anonymous-token option to specify a token to use when clients
+// try to retrieve files without providing their own Arvados API token.
+//
+//   keep-web [...] -anonymous-token=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+//
+// See http://doc.arvados.org/install/install-keep-web.html for examples.
+//
 // Download URLs
 //
 // The following "same origin" URL patterns are supported for public

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


hooks/post-receive
--