From b9acf4c150a5674b981f6f7dd77b8afa98494305 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Tue, 24 Oct 2023 22:50:55 +0200 Subject: [PATCH] hot fix: factory needs to override encryption settings --- machinery/src/config/main.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/machinery/src/config/main.go b/machinery/src/config/main.go index 14c0814..107582b 100644 --- a/machinery/src/config/main.go +++ b/machinery/src/config/main.go @@ -162,6 +162,12 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) { conjungo.Merge(&s3, configuration.CustomConfig.S3, opts) configuration.Config.S3 = &s3 + // Merge Encryption settings + var encryption models.Encryption + conjungo.Merge(&encryption, configuration.GlobalConfig.Encryption, opts) + conjungo.Merge(&encryption, configuration.CustomConfig.Encryption, opts) + configuration.Config.Encryption = &encryption + // Merge timetable manually because it's an array configuration.Config.Timetable = configuration.CustomConfig.Timetable