fix: failed to load cert file

fix: failed to load cert file

Author: mkitsdts

config.yaml.tmpl

@@ -8,9 +8,9 @@ database:
   kind: sqlite3       # 数据库类型，支持mysql和postgres以及sqlite3
 
 tls:
-  enabled: false              # 是否启用TLS
-  cert: static/server.crt   # TLS证书文件路径
-  key: static/server.key    # TLS密钥文件路径
+  enabled: false     # 是否启用TLS
+  cert: server.crt   # TLS证书文件路径
+  key: server.key    # TLS密钥文件路径
 
 cert_control:
   email: 114514@colima.com      # 注册 Let's Encrypt 账号的邮箱

config/config.go

@@ -76,7 +76,6 @@ var Cfg *Config = &Config{}
 func Init() {
 	// Fallback to config.yaml file if exists
 	configPath := path.Join(models.Default_Data_Path, models.Default_Config_File_Path)
-	fmt.Println("Config Path ", configPath)
 	file, err := os.Open(configPath)
 	if err != nil {
 		slog.Warn("config file not found, writing default config.yaml")
@@ -99,5 +98,10 @@ func Init() {
 	Cfg.Site.Server = fmt.Sprintf("http://localhost:%d", Cfg.Server.Port)
 	Cfg.Site.DevMode = Cfg.Server.Devmode
 
+	if Cfg.TLS.Enabled {
+		Cfg.TLS.Cert = path.Join(path.Join(models.Default_Data_Path, Cfg.TLS.Cert))
+		Cfg.TLS.Key = path.Join(models.Default_Data_Path, Cfg.TLS.Key)
+	}
+
 	slog.Info("Configuration loaded", "database", Cfg.Database, "tls", Cfg.TLS, "auth_enabled", Cfg.Auth.Enabled, "server", Cfg.Server)
 }

config/impl.go

@@ -17,9 +17,9 @@ database:
   kind: sqlite3       # 数据库类型，支持mysql和postgres以及sqlite3
 
 tls:
-  enabled: false              # 是否启用TLS
-  cert: static/server.crt   # TLS证书文件路径
-  key: static/server.key    # TLS密钥文件路径
+  enabled: false     # 是否启用TLS
+  cert: server.crt   # TLS证书文件路径
+  key: server.key    # TLS密钥文件路径
 
 cert_control:
   email: 114514@colima.com      # 注册 Let's Encrypt 账号的邮箱

pkg/tls_cert/cert.go

@@ -4,16 +4,14 @@ import (
 	"crypto/tls"
 	"log/slog"
 	"mkBlog/config"
-	"mkBlog/models"
-	"path"
 	"sync"
 )
 
 var currentCert *tls.Certificate
 var certMux sync.RWMutex
 
 func LoadCert() {
-	newCert, err := tls.LoadX509KeyPair(path.Join(models.Default_Data_Path, config.Cfg.TLS.Cert), path.Join(models.Default_Data_Path, config.Cfg.TLS.Key))
+	newCert, err := tls.LoadX509KeyPair(config.Cfg.TLS.Cert, config.Cfg.TLS.Key)
 	if err != nil {
 		slog.Error("Failed to load X509 certfile.", " check error: ", err)
 	}