Use certmagic, simplify config, set HTTP timeouts and a modern TLSConfig
This commit is contained in:
parent
c5a9a5b1c1
commit
6c3a5777c4
171 changed files with 30701 additions and 4912 deletions
2
vendor/github.com/spf13/viper/viper.go
generated
vendored
2
vendor/github.com/spf13/viper/viper.go
generated
vendored
|
@ -1267,11 +1267,13 @@ func (v *Viper) MergeConfig(in io.Reader) error {
|
|||
}
|
||||
|
||||
// MergeConfigMap merges the configuration from the map given with an existing config.
|
||||
// Note that the map given may be modified.
|
||||
func MergeConfigMap(cfg map[string]interface{}) error { return v.MergeConfigMap(cfg) }
|
||||
func (v *Viper) MergeConfigMap(cfg map[string]interface{}) error {
|
||||
if v.config == nil {
|
||||
v.config = make(map[string]interface{})
|
||||
}
|
||||
insensitiviseMap(cfg)
|
||||
mergeMaps(cfg, v.config, nil)
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue