public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into interval

Browse Source
This commit is contained in:
bergquist
2016-10-14 09:15:04 +02:00
parent f4e0a9245e fb99d9d680
commit aeb0c5cb53
7 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/login/ldap.go
+1 -1
View File
@@ -30,7 +30,7 @@ func (a *ldapAuther) Dial() error {
var err error
var certPool *x509.CertPool
if a.server.RootCACert != "" {
certPool := x509.NewCertPool()
certPool = x509.NewCertPool()
for _, caCertFile := range strings.Split(a.server.RootCACert, " ") {
if pem, err := ioutil.ReadFile(caCertFile); err != nil {
return err
pkg/setting/setting.go
+1 -1
View File
@@ -461,7 +461,7 @@ func NewConfigContext(args *CommandLineArgs) error {
Env = Cfg.Section("").Key("app_mode").MustString("development")
InstanceName = Cfg.Section("").Key("instance_name").MustString("unknown_instance_name")
PluginsPath = Cfg.Section("paths").Key("plugins").String()
PluginsPath = makeAbsolute(Cfg.Section("paths").Key("plugins").String(), HomePath)
server := Cfg.Section("server")
AppUrl, AppSubUrl = parseAppUrlAndSubUrl(server)