[ARVADOS] updated: 1.3.0-1544-g046f331b3
Git user
git at public.curoverse.com
Fri Aug 16 19:25:25 UTC 2019
Summary of changes:
doc/admin/config-migration.html.textile.liquid | 2 +-
doc/admin/upgrading.html.textile.liquid | 2 +-
doc/install/install-keepproxy.html.textile.liquid | 11 ++++++++---
services/keepproxy/keepproxy.go | 1 -
services/keepproxy/usage.go | 23 -----------------------
5 files changed, 10 insertions(+), 29 deletions(-)
delete mode 100644 services/keepproxy/usage.go
via 046f331b3f9d99f54ad254ad274aa976bd06c30f (commit)
from 281564ef3672e8655f95d2c7df031b552e090ccc (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 046f331b3f9d99f54ad254ad274aa976bd06c30f
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Fri Aug 16 15:25:02 2019 -0400
14715: Fixes help CLI and updates docs
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
diff --git a/doc/admin/config-migration.html.textile.liquid b/doc/admin/config-migration.html.textile.liquid
index 97039b394..f79dffd84 100644
--- a/doc/admin/config-migration.html.textile.liquid
+++ b/doc/admin/config-migration.html.textile.liquid
@@ -64,7 +64,7 @@ Currently only reads @RemoteClusters@ from centralized configuration. Still req
h2(#keepproxy). keepproxy
-The legacy keepproxy config is stored at @/etc/arvados/keepproxy/keepproxy.yml@ and will continue to take precedence over the cluster config, unless removed. Also, a legacy keepproxy config in a different path can be used with the @-config=path/to/legacy/config@ keepproxy command line argument. If a @-config@ command line argument is provided, this will take precedence over @/etc/arvados/keepproxy/keepproxy.yml@ and the cluster config. If migrated to the centralized config at @/etc/arvados/config.yml@, @keepproxy.yml@ should be moved out of the way and/or deleted and the @config@ command line argument should not be used.
+The legacy keepproxy config is stored at @/etc/arvados/keepproxy/keepproxy.yml@ by default and will continue to take precedence over the cluster config, unless removed. Also, a legacy keepproxy config in a different path can still be used with the @-legacy-keepproxy-config=path/to/legacy/config@ keepproxy command line argument. If the @-legacy-keepproxy-config@ command line argument is provided, this will take precedence over @/etc/arvados/keepproxy/keepproxy.yml@ and the cluster config. If migrated to the centralized config at @/etc/arvados/config.yml@, @keepproxy.yml@ should be moved out of the way and/or deleted and the @-legacy-keepproxy-config@ command line argument should not be used.
Configuration via individual command line arguments is no longer available. The following table maps former keepproxy command line arguments and legacy config values to their equivalent representation in the centralized config, which may need to be set manually.
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 28f08db4d..28a6ef89e 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -53,7 +53,7 @@ So that older Arvados sites don't lose access to legacy records, the API has bee
h4. Keepproxy configuration migration
-Keepproxy can now be configured using the centralized config at @/etc/arvados/config.yml at . Some configuration options are no longer supported. Please see "keepproxy's config migration guide":{{site.baseurl}}/admin/config-migration.html#keepproxy for more details.
+(feature "#14715":https://dev.arvados.org/issues/14715 ) Keepproxy can now be configured using the centralized config at @/etc/arvados/config.yml at . Some configuration options are no longer supported. Please see "keepproxy's config migration guide":{{site.baseurl}}/admin/config-migration.html#keepproxy for more details.
h4. No longer stripping ':' from strings in serialized database columns
diff --git a/doc/install/install-keepproxy.html.textile.liquid b/doc/install/install-keepproxy.html.textile.liquid
index da1146d88..910e47e0e 100644
--- a/doc/install/install-keepproxy.html.textile.liquid
+++ b/doc/install/install-keepproxy.html.textile.liquid
@@ -44,9 +44,14 @@ Verify that Keepproxy is functional:
<notextile>
<pre><code>~$ <span class="userinput">keepproxy -h</span>
-...
-Usage: keepproxy [-config path/to/keepproxy.yml]
-...
+Usage of keepproxy:
+ -config file
+ Site configuration file (default may be overridden by setting an ARVADOS_CONFIG environment variable) (default "/etc/arvados/config.yml")
+ -dump-config
+ write current configuration to stdout and exit
+[...]
+ -version
+ print version information and exit.
</code></pre>
</notextile>
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 685007481..9244fe00c 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -43,7 +43,6 @@ const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
func configure(logger log.FieldLogger, args []string) (*arvados.Cluster, error) {
flags := flag.NewFlagSet(args[0], flag.ExitOnError)
- flags.Usage = usage
dumpConfig := flags.Bool("dump-config", false, "write current configuration to stdout and exit")
getVersion := flags.Bool("version", false, "Print version information and exit.")
diff --git a/services/keepproxy/usage.go b/services/keepproxy/usage.go
deleted file mode 100644
index 4eeb55065..000000000
--- a/services/keepproxy/usage.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-package main
-
-import (
- "fmt"
- "os"
-)
-
-func usage() {
- fmt.Fprintf(os.Stderr, `
-Keepproxy forwards GET and PUT requests to keepstore servers. See
-http://doc.arvados.org/install/install-keepproxy.html
-
-Usage: keepproxy [-config path/to/keepproxy.yml]
-
-DEPRECATION WARNING: The -config parameter is deprecated. Use the
-cluster config instead.
-
-`)
-}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list