From a0cf13ba00f230fb0adfe9e6ea1914d29dfd1cd3 Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 27 Sep 2021 13:43:47 +0200 Subject: [PATCH] config: make etcd, tor and auth groups so they can be specified inline Our yaml parsing is unaffected, but this change allows us to specify these groups one param at a time. We do not update services because they require special grouping, so we leave that as a json parameter. --- config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.go b/config.go index 6569677..0739f6f 100644 --- a/config.go +++ b/config.go @@ -67,11 +67,11 @@ type Config struct { // directory defined by StaticRoot. ServeStatic bool `long:"servestatic" description:"Flag to enable or disable static content serving."` - Etcd *EtcdConfig `long:"etcd" description:"Configuration for the etcd instance backing the proxy."` + Etcd *EtcdConfig `group:"etcd" namespace:"etcd"` - Authenticator *AuthConfig `long:"authenticator" description:"Configuration for the authenticator."` + Authenticator *AuthConfig `group:"authenticator" namespace:"authenticator"` - Tor *TorConfig `long:"tor" description:"Configuration for the Tor instance backing the proxy."` + Tor *TorConfig `group:"tor" namespace:"tor"` // Services is a list of JSON objects in string format, which specify // each backend service to Aperture.