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

fix sample.ini (#37106)

Browse Source
This commit is contained in:
Alexander Emelin 2021-07-22 17:50:27 +03:00 committed by GitHub
parent 2f4c893cf3
commit 6b2d33dc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/sample.ini
View File

@ -995,12 +995,12 @@
[geomap] [geomap]
# Set the JSON configuration for the default basemap # Set the JSON configuration for the default basemap
;default_baselayer_config = `{ ;default_baselayer_config = `{
"type": "xyz", ; "type": "xyz",
"config": { ; "config": {
"attribution": "Open street map", ; "attribution": "Open street map",
"url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png" ; "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
} ; }
}` ;}`
# Enable or disable loading other base map layers # Enable or disable loading other base map layers
;enable_custom_baselayers = true ;enable_custom_baselayers = true

10
pkg/setting/setting_test.go
View File

@ -54,6 +54,16 @@ func TestLoadingSettings(t *testing.T) {
} }
}) })
Convey("sample.ini should load successfully", func() {
customInitPath := CustomInitPath
CustomInitPath = "conf/sample.ini"
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{HomePath: "../../"})
So(err, ShouldBeNil)
// Restore CustomInitPath to avoid side effects.
CustomInitPath = customInitPath
})
Convey("Should be able to override via environment variables", func() { Convey("Should be able to override via environment variables", func() {
err := os.Setenv("GF_SECURITY_ADMIN_USER", "superduper") err := os.Setenv("GF_SECURITY_ADMIN_USER", "superduper")
require.NoError(t, err) require.NoError(t, err)