From 0284dc4e4d62d261a6146bdcee79d809ec9f60ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Apr 2022 13:02:22 +0200 Subject: [PATCH] Manager: move actually-used config options up in the struct There are a bunch of should-be-implemented options commented out, and the actually-used options shouldn't be in between those. No functional changes. --- internal/manager/config/config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go index d3b24386..1a5ee521 100644 --- a/internal/manager/config/config.go +++ b/internal/manager/config/config.go @@ -73,6 +73,11 @@ type Base struct { Listen string `yaml:"listen"` // ListenHTTPS string `yaml:"listen_https"` + SSDPDiscovery bool `yaml:"autodiscoverable"` + + // Storage configuration: + Shaman shaman_config.Config `yaml:"shaman"` + // TLS certificate management. TLSxxx has priority over ACME. // TLSKey string `yaml:"tlskey"` // TLSCert string `yaml:"tlscert"` @@ -92,13 +97,8 @@ type Base struct { // (even when there are workers left that could technically retry the task). // TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"` - SSDPDiscovery bool `yaml:"autodiscoverable"` - // TestTasks TestTasks `yaml:"test_tasks"` - // Shaman configuration settings. - Shaman shaman_config.Config `yaml:"shaman"` - // Authentication settings. // JWT jwtauth.Config `yaml:"user_authentication"` // WorkerRegistrationSecret string `yaml:"worker_registration_secret"`