Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00
Code Issues Releases Activity

fix(server):support disable https only ee-2068 (#6232)

Browse source 
* fix/ee-2068/disable-forcely-https
This commit is contained in:
sunportainer 2021-12-14 08:40:44 +08:00 • committed by GitHub
parent da422d6ed6
commit 7088da5157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
api/cmd/portainer/main.go
View file

@ -234,14 +234,16 @@ func updateSettingsFromFlags(dataStore portainer.DataStore, flags *portainer.CLI
return err
}
httpEnabled := !*flags.HTTPDisabled
sslSettings, err := dataStore.SSLSettings().Settings()
if err != nil {
return err
}
sslSettings.HTTPEnabled = httpEnabled
if *flags.HTTPDisabled {
sslSettings.HTTPEnabled = false
} else {
sslSettings.HTTPEnabled = *flags.HTTPEnabled || sslSettings.HTTPEnabled
}
err = dataStore.SSLSettings().UpdateSettings(sslSettings)
if err != nil {
@ -551,11 +553,9 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
log.Fatalf("failed initializing helm package manager: %s", err)
}
if dataStore.IsNew() {
err = updateSettingsFromFlags(dataStore, flags)
if err != nil {
log.Fatalf("failed updating settings from flags: %v", err)
}
err = updateSettingsFromFlags(dataStore, flags)
if err != nil {
log.Fatalf("failed updating settings from flags: %v", err)
}
err = edge.LoadEdgeJobs(dataStore, reverseTunnelService)