mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Server: Reload TLS certs without a server restart (#83589)
* server: reload of grafana server certs when renewed without restart. Signed-off-by: Rao, B V Chalapathi <b_v_chalapathi.rao@nokia.com> * server: reload of grafana server certs when renewed without restart. Signed-off-by: Rao, B V Chalapathi <b_v_chalapathi.rao@nokia.com> * Update http_server.go * Update docs/sources/setup-grafana/configure-grafana/_index.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update http_server.go Address the comments * Update docs/sources/setup-grafana/configure-grafana/_index.md Co-authored-by: Dan Cech <dan@aussiedan.com> * Update http_server.go Align the spaces * Update http_server.go * Update http_server.go * Update pkg/api/http_server.go Co-authored-by: Dan Cech <dan@aussiedan.com> --------- Signed-off-by: Rao, B V Chalapathi <b_v_chalapathi.rao@nokia.com> Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Dan Cech <dan@aussiedan.com>
This commit is contained in:
@@ -91,27 +91,28 @@ type Cfg struct {
|
||||
appliedEnvOverrides []string
|
||||
|
||||
// HTTP Server Settings
|
||||
CertFile string
|
||||
KeyFile string
|
||||
HTTPAddr string
|
||||
HTTPPort string
|
||||
Env string
|
||||
AppURL string
|
||||
AppSubURL string
|
||||
InstanceName string
|
||||
ServeFromSubPath bool
|
||||
StaticRootPath string
|
||||
Protocol Scheme
|
||||
SocketGid int
|
||||
SocketMode int
|
||||
SocketPath string
|
||||
RouterLogging bool
|
||||
Domain string
|
||||
CDNRootURL *url.URL
|
||||
ReadTimeout time.Duration
|
||||
EnableGzip bool
|
||||
EnforceDomain bool
|
||||
MinTLSVersion string
|
||||
CertFile string
|
||||
KeyFile string
|
||||
CertWatchInterval time.Duration
|
||||
HTTPAddr string
|
||||
HTTPPort string
|
||||
Env string
|
||||
AppURL string
|
||||
AppSubURL string
|
||||
InstanceName string
|
||||
ServeFromSubPath bool
|
||||
StaticRootPath string
|
||||
Protocol Scheme
|
||||
SocketGid int
|
||||
SocketMode int
|
||||
SocketPath string
|
||||
RouterLogging bool
|
||||
Domain string
|
||||
CDNRootURL *url.URL
|
||||
ReadTimeout time.Duration
|
||||
EnableGzip bool
|
||||
EnforceDomain bool
|
||||
MinTLSVersion string
|
||||
|
||||
// Security settings
|
||||
SecretKey string
|
||||
@@ -1837,6 +1838,7 @@ func (cfg *Cfg) readServerSettings(iniFile *ini.File) error {
|
||||
cfg.AppSubURL = AppSubUrl
|
||||
cfg.Protocol = HTTPScheme
|
||||
cfg.ServeFromSubPath = server.Key("serve_from_sub_path").MustBool(false)
|
||||
cfg.CertWatchInterval = server.Key("certs_watch_interval").MustDuration(0)
|
||||
|
||||
protocolStr := valueAsString(server, "protocol", "http")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user