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 08e7af268ac10a971dd7c7aaa4693c9dfcd4099f..0a00ca85f1d87348103e27b949575682e70e6174 100644 (file)
--- 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 db402411f96f409b57d96b8a4cc53924288d4c82..85ea1c6933111b10c16717668b878867a3580f0b 100644 (file)
--- 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 7e0a00f9bc9e562bdc226659ba98708d4c2b87b1..2ebda6ef72523ed66263007329e3093c32b763e2 100644 (file)
--- 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