Merge branch 'kerberos-io:master' into master

kerberos-io · Sep 14, 2023 · bedb3c0 · bedb3c0
2 parents 2539255 + 24136f8
commit bedb3c0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/machinery/src/config/main.go b/machinery/src/config/main.go
@@ -141,8 +141,13 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
 			},
 		)
 
-		// Merge Config toplevel
+		// Reset main configuration Config.
+		configuration.Config = models.Config{}
+
+		// Merge the global settings in the main config
 		conjungo.Merge(&configuration.Config, configuration.GlobalConfig, opts)
+
+		// Now we might override some settings with the custom config
 		conjungo.Merge(&configuration.Config, configuration.CustomConfig, opts)
 
 		// Merge Kerberos Vault settings