Merge branch '14482-rubysdk-empty-dir'

[arvados.git] / services / ws / config.go

diff --git a/services/ws/config.go b/services/ws/config.go
index 79c2f232daf5059c4b51f7d1bb2fa27a592c5f64..ead1ec20c6a1de471e82f2e82ad0c24b5e3a4b93 100644 (file)
--- a/services/ws/config.go
+++ b/services/ws/config.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -8,7 +12,7 @@ import (
 
 type wsConfig struct {
        Client       arvados.Client
-       Postgres     pgConfig
+       Postgres     arvados.PostgreSQLConnection
        PostgresPool int
        Listen       string
        LogLevel     string
@@ -17,6 +21,8 @@ type wsConfig struct {
        PingTimeout      arvados.Duration
        ClientEventQueue int
        ServerEventQueue int
+
+       ManagementToken string
 }
 
 func defaultConfig() wsConfig {
@@ -24,7 +30,7 @@ func defaultConfig() wsConfig {
                Client: arvados.Client{
                        APIHost: "localhost:443",
                },
-               Postgres: pgConfig{
+               Postgres: arvados.PostgreSQLConnection{
                        "dbname":                    "arvados_production",
                        "user":                      "arvados",
                        "password":                  "xyzzy",