mirror of
https://github.com/kerberos-io/agent.git
synced 2026-10-19 17:38:25 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24136f8b15 | ||
|
|
910bb3c079 |
@@ -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)
|
conjungo.Merge(&configuration.Config, configuration.GlobalConfig, opts)
|
||||||
|
|
||||||
|
// Now we might override some settings with the custom config
|
||||||
conjungo.Merge(&configuration.Config, configuration.CustomConfig, opts)
|
conjungo.Merge(&configuration.Config, configuration.CustomConfig, opts)
|
||||||
|
|
||||||
// Merge Kerberos Vault settings
|
// Merge Kerberos Vault settings
|
||||||
@@ -157,6 +162,9 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
|
|||||||
conjungo.Merge(&s3, configuration.CustomConfig.S3, opts)
|
conjungo.Merge(&s3, configuration.CustomConfig.S3, opts)
|
||||||
configuration.Config.S3 = &s3
|
configuration.Config.S3 = &s3
|
||||||
|
|
||||||
|
// Merge timetable manually because it's an array
|
||||||
|
configuration.Config.Timetable = configuration.CustomConfig.Timetable
|
||||||
|
|
||||||
// Cleanup
|
// Cleanup
|
||||||
opts = nil
|
opts = nil
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user