From bd9cb8a9d2c6dcf06c19d459547780d012df2cb7 Mon Sep 17 00:00:00 2001
From: BoYanZh <boyanzh233@gmail.com>
Date: Wed, 7 Jun 2023 02:46:31 +0800
Subject: [PATCH] fix: no breaking change from old config

---
 Dockerfile              | 2 +-
 cmd/server.go           | 4 ++++
 docker-compose.yml      | 1 -
 internal/conf/config.go | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 97d1b9e8811..5534aedd0ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,5 +14,5 @@ COPY entrypoint.sh /entrypoint.sh
 RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
     chmod +x /entrypoint.sh
 ENV PUID=0 PGID=0 UMASK=022
-EXPOSE 5244 5245
+EXPOSE 5244
 CMD [ "/entrypoint.sh" ]
diff --git a/cmd/server.go b/cmd/server.go
index 4b1edd14e8b..fdeba0a4d9e 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -42,6 +42,10 @@ the address is defined in config file`,
 		r := gin.New()
 		r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
 		server.Init(r)
+		if conf.Conf.HttpsPort == 0 && conf.Conf.Scheme.Https {
+			conf.Conf.Scheme.DisableHttp = true
+			conf.Conf.HttpsPort = conf.Conf.Port
+		}
 		var httpSrv, httpsSrv *http.Server
 		if !conf.Conf.Scheme.DisableHttp {
 			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
diff --git a/docker-compose.yml b/docker-compose.yml
index 05e9f8d790f..bad9b07ff6e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,6 @@ services:
       - '/etc/alist:/opt/alist/data'
     ports:
       - '5244:5244'
-      - '5245:5245'
     environment:
       - PUID=0
       - PGID=0
diff --git a/internal/conf/config.go b/internal/conf/config.go
index 515165fde7d..254abd82e7c 100644
--- a/internal/conf/config.go
+++ b/internal/conf/config.go
@@ -62,7 +62,7 @@ func DefaultConfig() *Config {
 	return &Config{
 		Address:        "0.0.0.0",
 		Port:           5244,
-		HttpsPort:      5245,
+		HttpsPort:      0,
 		JwtSecret:      random.String(16),
 		TokenExpiresIn: 48,
 		TempDir:        tempDir,