/tls/ -- add internal usable flag to simplify logic when https needs to be booted up

This commit is contained in:
Eugene Bujak
2019-02-19 15:21:38 +03:00
parent ba103f9825
commit 3c374b5940
3 changed files with 6 additions and 2 deletions

View File

@@ -1088,7 +1088,7 @@ func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
restartHTTPS := false
data = validateCertificates(data)
if data.WarningValidation == "" {
if data.usable {
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
@@ -1259,6 +1259,7 @@ func validateCertificates(data tlsConfig) tlsConfig {
data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
return data
}
data.usable = true
}
return data