golint: locHttps -> locHTTPS
This commit is contained in:
@@ -63,7 +63,7 @@ func init() {
|
|||||||
func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
|
func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
cert, err := tls.LoadX509KeyPair(locations[locHttpsCertFile], locations[locHttpsKeyFile])
|
cert, err := tls.LoadX509KeyPair(locations[locHTTPSCertFile], locations[locHTTPSKeyFile])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
l.Infoln("Loading HTTPS certificate:", err)
|
l.Infoln("Loading HTTPS certificate:", err)
|
||||||
l.Infoln("Creating new HTTPS certificate")
|
l.Infoln("Creating new HTTPS certificate")
|
||||||
@@ -76,7 +76,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
|
|||||||
name = tlsDefaultCommonName
|
name = tlsDefaultCommonName
|
||||||
}
|
}
|
||||||
|
|
||||||
cert, err = newCertificate(locations[locHttpsCertFile], locations[locHttpsKeyFile], name)
|
cert, err = newCertificate(locations[locHTTPSCertFile], locations[locHTTPSKeyFile], name)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ const (
|
|||||||
locConfigFile locationEnum = "config"
|
locConfigFile locationEnum = "config"
|
||||||
locCertFile = "certFile"
|
locCertFile = "certFile"
|
||||||
locKeyFile = "keyFile"
|
locKeyFile = "keyFile"
|
||||||
locHttpsCertFile = "httpsCertFile"
|
locHTTPSCertFile = "httpsCertFile"
|
||||||
locHttpsKeyFile = "httpsKeyFile"
|
locHTTPSKeyFile = "httpsKeyFile"
|
||||||
locDatabase = "database"
|
locDatabase = "database"
|
||||||
locLogFile = "logFile"
|
locLogFile = "logFile"
|
||||||
locCsrfTokens = "csrfTokens"
|
locCsrfTokens = "csrfTokens"
|
||||||
@@ -43,8 +43,8 @@ var locations = map[locationEnum]string{
|
|||||||
locConfigFile: "${config}/config.xml",
|
locConfigFile: "${config}/config.xml",
|
||||||
locCertFile: "${config}/cert.pem",
|
locCertFile: "${config}/cert.pem",
|
||||||
locKeyFile: "${config}/key.pem",
|
locKeyFile: "${config}/key.pem",
|
||||||
locHttpsCertFile: "${config}/https-cert.pem",
|
locHTTPSCertFile: "${config}/https-cert.pem",
|
||||||
locHttpsKeyFile: "${config}/https-key.pem",
|
locHTTPSKeyFile: "${config}/https-key.pem",
|
||||||
locDatabase: "${config}/index-v0.11.0.db",
|
locDatabase: "${config}/index-v0.11.0.db",
|
||||||
locLogFile: "${config}/syncthing.log", // -logfile on Windows
|
locLogFile: "${config}/syncthing.log", // -logfile on Windows
|
||||||
locCsrfTokens: "${config}/csrftokens.txt",
|
locCsrfTokens: "${config}/csrftokens.txt",
|
||||||
|
|||||||
0
cmd/syncthing/testdata/.stfolder
vendored
Normal file
0
cmd/syncthing/testdata/.stfolder
vendored
Normal file
0
cmd/syncthing/testdata/testfolder/.stfolder
vendored
Normal file
0
cmd/syncthing/testdata/testfolder/.stfolder
vendored
Normal file
Reference in New Issue
Block a user