IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Expand variables in configuration (#25075)

Browse Source
This commit is contained in:
Emil Tullstedt
2020-06-10 14:58:42 +02:00
committed by GitHub
parent 55f304f15d
commit e8b5f2330d
4 changed files with 251 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/ldap/settings.go
View File

@@ -125,7 +125,10 @@ func readConfig(configFile string) (*Config, error) {
}
// interpolate full toml string (it can contain ENV variables)
stringContent := setting.EvalEnvVarExpression(string(fileBytes))
stringContent, err := setting.ExpandVar(string(fileBytes))
if err != nil {
return nil, errutil.Wrap("Failed to expand variables", err)
}
_, err = toml.Decode(stringContent, result)
if err != nil {