From b476e31c0c28be2bc941dd572c75c8e782167548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 8 Mar 2024 16:41:40 +0100 Subject: [PATCH] Manager: remove unused configuration defaults Remove commented-out sections in the configuration defaults. They're a leftover from Flamenco v2. --- internal/manager/config/defaults.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index 896edc04..da4619eb 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -16,9 +16,8 @@ var defaultConfig = Conf{ Base: Base{ Meta: ConfMeta{Version: latestConfigVersion}, - ManagerName: "Flamenco", - Listen: ":8080", - // ListenHTTPS: ":8433", + ManagerName: "Flamenco", + Listen: ":8080", DatabaseDSN: "flamenco-manager.sqlite", DBIntegrityCheck: 10 * time.Minute, SSDPDiscovery: true, @@ -38,25 +37,8 @@ var defaultConfig = Conf{ TaskTimeout: 10 * time.Minute, WorkerTimeout: 1 * time.Minute, - // // Days are assumed to be 24 hours long. This is not exactly accurate, but should - // // be accurate enough for this type of cleanup. - // TaskCleanupMaxAge: 14 * 24 * time.Hour, - BlocklistThreshold: 3, TaskFailAfterSoftFailCount: 3, - - // WorkerCleanupStatus: []string{string(api.WorkerStatusOffline)}, - - // TestTasks: TestTasks{ - // BlenderRender: BlenderRenderConfig{ - // JobStorage: "{job_storage}/test-jobs", - // RenderOutput: "{render}/test-renders", - // }, - // }, - - // JWT: jwtauth.Config{ - // DownloadKeysInterval: 1 * time.Hour, - // }, }, Variables: map[string]Variable{