X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/16f704326f44fd1e5e5e60b936c9b5895d6a6ff8..e94ed22c9f40ecafd3cb1ee1349eaee018b4d883:/services/ws/doc.go diff --git a/services/ws/doc.go b/services/ws/doc.go index 092539747e..806c3355da 100644 --- a/services/ws/doc.go +++ b/services/ws/doc.go @@ -6,7 +6,7 @@ // cache-invalidation event feed at "ws://.../websocket") to // websocket clients. // -// Installation +// Installation and configuration // // See https://doc.arvados.org/install/install-ws.html. // @@ -16,25 +16,14 @@ // // Usage // -// arvados-ws [-config /etc/arvados/ws/ws.yml] [-dump-config] -// -// Minimal configuration -// -// Client: -// APIHost: localhost:443 -// Listen: ":1234" -// Postgres: -// dbname: arvados_production -// host: localhost -// password: xyzzy -// user: arvados +// arvados-ws [-legacy-ws-config /etc/arvados/ws/ws.yml] [-dump-config] // // Options // -// -config path +// -legacy-ws-config path // -// Load configuration from the given file instead of the default -// /etc/arvados/ws/ws.yml +// Load legacy configuration from the given file instead of the default +// /etc/arvados/ws/ws.yml, legacy config overrides the clusterwide config.yml. // // -dump-config //