14716: Removes old usage message.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 80227e6cd0a79335e7486beac156c72cde4b8d87..679f04b981ec1236871925f168c3a94841f2321f 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -743,9 +743,6 @@ def setup_config():
                 "Services": services,
                 "Users": {
                     "AnonymousUserToken": auth_token('anonymous')
-                },
-                "Collections": {
-                    "TrustAllContent": True
                 }
             }
         }

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index b8b2725096dceefe4e0807e8a063a743bf3b4d1c..289f413f5d13b25ff96e3f16d7d3ca62940220fa 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -61,7 +61,6 @@ func main() {
        logger := log.New()
 
        flags := flag.NewFlagSet(prog, flag.ExitOnError)
-       flags.Usage = usage
 
        loader := config.NewLoader(os.Stdin, logger)
        loader.SetupFlags(flags)

diff --git a/services/keep-web/usage.go b/services/keep-web/usage.go
deleted file mode 100644 (file)
index fda030d..0000000
--- a/services/keep-web/usage.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-package main
-
-import (
-       "encoding/json"
-       "flag"
-       "fmt"
-       "os"
-)
-
-func usage() {
-       c := DefaultConfig(nil)
-       c.cluster.Users.AnonymousUserToken = "xxxxxxxxxxxxxxxxxxxxxxx"
-       c.Client.APIHost = "zzzzz.arvadosapi.com:443"
-       exampleConfigFile, err := json.MarshalIndent(c, "    ", "  ")
-       if err != nil {
-               panic(err)
-       }
-       fmt.Fprintf(os.Stderr, `
-
-Keep-web provides read-only HTTP access to files stored in Keep; see
-https://godoc.org/github.com/curoverse/arvados/services/keep-web and
-http://doc.arvados.org/install/install-keep-web.html
-
-Usage: keep-web -config path/to/keep-web.yml
-
-Options:
-`)
-       flag.PrintDefaults()
-       fmt.Fprintf(os.Stderr, `
-Example config file:
-    %s
-
-Client.APIHost:
-
-    Address (or address:port) of the Arvados API endpoint.
-
-Client.AuthToken:
-
-    Unused. Normally empty, or omitted entirely.
-
-Client.Insecure:
-
-    True if your Arvados API endpoint uses an unverifiable SSL/TLS
-    certificate.
-
-Listen:
-
-    Local port to listen on. Can be "address", "address:port", or
-    ":port", where "address" is a host IP address or name and "port"
-    is a port number or name.
-
-AnonymousTokens:
-
-    Array of tokens to try when a client does not provide a token.
-
-AttachmentOnlyHost:
-
-    Accept credentials, and add "Content-Disposition: attachment"
-    response headers, for requests at this hostname:port.
-
-    This prohibits inline display, which makes it possible to serve
-    untrusted and non-public content from a single origin, i.e.,
-    without wildcard DNS or SSL.
-
-TrustAllContent:
-
-    Serve non-public content from a single origin. Dangerous: read
-    docs before using!
-
-Cache.TTL:
-
-    Maximum time to cache manifests and permission checks.
-
-Cache.UUIDTTL:
-
-    Maximum time to cache collection state.
-
-Cache.MaxCollectionEntries:
-
-    Maximum number of collection cache entries.
-
-Cache.MaxCollectionBytes:
-
-    Approximate memory limit for collection cache.
-
-Cache.MaxPermissionEntries:
-
-    Maximum number of permission cache entries.
-
-Cache.MaxUUIDEntries:
-
-    Maximum number of UUID cache entries.
-
-`, exampleConfigFile)
-}