fix: no breaking change from old config

BoYanZh · Jun 6, 2023 · bd9cb8a · bd9cb8a
1 parent 0b1ec95
commit bd9cb8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,