From cf459a2d28414eafbb63ce1e32cb572c815e9f26 Mon Sep 17 00:00:00 2001 From: Marcelo Rydel Date: Tue, 1 Feb 2022 09:14:43 -0300 Subject: [PATCH] fix(ssl): default httpEnabled to false [EE-2465] (#6495) --- api/cli/defaults.go | 2 +- api/cli/defaults_windows.go | 2 +- api/cmd/portainer/main.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/cli/defaults.go b/api/cli/defaults.go index fb81238e0..e7891cf3f 100644 --- a/api/cli/defaults.go +++ b/api/cli/defaults.go @@ -16,7 +16,7 @@ const ( defaultTLSCertPath = "/certs/cert.pem" defaultTLSKeyPath = "/certs/key.pem" defaultHTTPDisabled = "false" - defaultHTTPEnabled = "true" + defaultHTTPEnabled = "false" defaultSSL = "false" defaultSSLCertPath = "/certs/portainer.crt" defaultSSLKeyPath = "/certs/portainer.key" diff --git a/api/cli/defaults_windows.go b/api/cli/defaults_windows.go index 007c7af69..249082fb5 100644 --- a/api/cli/defaults_windows.go +++ b/api/cli/defaults_windows.go @@ -13,7 +13,7 @@ const ( defaultTLSCertPath = "C:\\certs\\cert.pem" defaultTLSKeyPath = "C:\\certs\\key.pem" defaultHTTPDisabled = "false" - defaultHTTPEnabled = "true" + defaultHTTPEnabled = "false" defaultSSL = "false" defaultSSLCertPath = "C:\\certs\\portainer.crt" defaultSSLKeyPath = "C:\\certs\\portainer.key" diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 0fd324620..ba62daaf1 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -285,8 +285,8 @@ func updateSettingsFromFlags(dataStore dataservices.DataStore, flags *portainer. if *flags.HTTPDisabled { sslSettings.HTTPEnabled = false - } else { - sslSettings.HTTPEnabled = *flags.HTTPEnabled || sslSettings.HTTPEnabled + } else if *flags.HTTPEnabled { + sslSettings.HTTPEnabled = true } err = dataStore.SSLSettings().UpdateSettings(sslSettings)