Added new backend setting for license file

This commit is contained in:
Torkel Ödegaard
2018-11-01 12:07:11 +01:00
parent 6a9e18c9cb
commit 28b0ae1d82
3 changed files with 17 additions and 6 deletions
+4
View File
@@ -557,3 +557,7 @@ callback_url =
[panels]
enable_alpha = false
[enterprise]
license_path =
+5
View File
@@ -475,3 +475,8 @@ log_queries =
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =
[enterprise]
# Path to a valid Grafana Enterprise license.jwt file
;license_path =
+8 -6
View File
@@ -209,12 +209,10 @@ type Cfg struct {
RendererLimitAlerting int
DisableBruteForceLoginProtection bool
TempDataLifetime time.Duration
MetricsEndpointEnabled bool
EnableAlphaPanels bool
TempDataLifetime time.Duration
MetricsEndpointEnabled bool
EnableAlphaPanels bool
EnterpriseLicensePath string
}
type CommandLineArgs struct {
@@ -715,6 +713,10 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
imageUploadingSection := iniFile.Section("external_image_storage")
ImageUploadProvider = imageUploadingSection.Key("provider").MustString("")
enterprise := iniFile.Section("enterprise")
cfg.EnterpriseLicensePath = enterprise.Key("license_path").MustString(filepath.Join(cfg.DataPath, "license.jwt"))
return nil
}