From 4bd3f61ce66387ed6b0a5427c45343648f218a6e Mon Sep 17 00:00:00 2001
From: cong meng <mcpacino@gmail.com>
Date: Tue, 25 Jan 2022 09:32:31 +1300
Subject: [PATCH] fix(db) EE-2425 http-disabled flag does not work (#6447)

Co-authored-by: Simon Meng <simon.meng@portainer.io>
---
 api/cmd/portainer/main.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go
index 85c1f586b..95adf5c7c 100644
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -107,11 +107,6 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
 	if isNew {
 		// from MigrateData
 		store.VersionService.StoreDBVersion(portainer.DBVersion)
-
-		err := updateSettingsFromFlags(store, flags)
-		if err != nil {
-			log.Fatalf("Failed updating settings from flags: %v", err)
-		}
 	} else {
 		storedVersion, err := store.VersionService.DBVersion()
 		if err != nil {
@@ -125,6 +120,11 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
 		}
 	}
 
+	err = updateSettingsFromFlags(store, flags)
+	if err != nil {
+		log.Fatalf("Failed updating settings from flags: %v", err)
+	}
+
 	// this is for the db restore functionality - needs more tests.
 	go func() {
 		<-shutdownCtx.Done()