perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1539 from calmh/locations

Browse Source 
Move index to index-v0.11.0.db (new format) and centralize location config
This commit is contained in:
Audrius Butkevicius
2015-04-01 13:18:49 +01:00
parent 529c386943 54752deaa1
commit 2aa3182476
20 changed files with 184 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/syncthing/gui.go
View File

@@ -63,7 +63,7 @@ func init() {
func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
var err error
cert, err := loadCert(confDir, "https-")
cert, err := tls.LoadX509KeyPair(locations[locHttpsCertFile], locations[locHttpsKeyFile])
if err != nil {
l.Infoln("Loading HTTPS certificate:", err)
l.Infoln("Creating new HTTPS certificate")
@@ -76,8 +76,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
name = tlsDefaultCommonName
}
newCertificate(confDir, "https-", name)
cert, err = loadCert(confDir, "https-")
cert, err = newCertificate(locations[locHttpsCertFile], locations[locHttpsKeyFile], name)
}
if err != nil {
return err