Compare commits

...

2 Commits

Author SHA1 Message Date
Cédric Verstraeten
3a984f1c73 Merge pull request #180 from kerberos-io/fix/merge-secondary-kerberos-vault-settings
Add support for secondary Kerberos Vault settings in configuration
2025-04-27 21:23:55 +02:00
cedricve
b84e34da06 Add support for secondary Kerberos Vault settings in configuration 2025-04-27 21:21:00 +02:00

View File

@@ -135,6 +135,12 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
conjungo.Merge(&kerberosvault, configuration.CustomConfig.KStorage, opts)
configuration.Config.KStorage = &kerberosvault
// Merge Secondary Kerberos Vault settings
var kerberosvaultSecondary models.KStorage
conjungo.Merge(&kerberosvaultSecondary, configuration.GlobalConfig.KStorageSecondary, opts)
conjungo.Merge(&kerberosvaultSecondary, configuration.CustomConfig.KStorageSecondary, opts)
configuration.Config.KStorageSecondary = &kerberosvaultSecondary
// Merge Kerberos S3 settings
var s3 models.S3
conjungo.Merge(&s3, configuration.GlobalConfig.S3, opts)