From a6ab9b24fa0c01d722b1d980e989f0c4e68db447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sat, 10 Jan 2026 00:16:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20vhost=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/apps/phpmyadmin/app.go | 10 +++++----- internal/data/cert.go | 9 ++++----- internal/data/website.go | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/internal/apps/phpmyadmin/app.go b/internal/apps/phpmyadmin/app.go index 698bbe05..f02f55f9 100644 --- a/internal/apps/phpmyadmin/app.go +++ b/internal/apps/phpmyadmin/app.go @@ -55,7 +55,7 @@ func (s *App) Info(w http.ResponseWriter, r *http.Request) { return } - conf, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root)) + conf, err := io.Read(fmt.Sprintf("%s/sites/phpmyadmin/config/nginx.conf", app.Root)) if err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return @@ -79,13 +79,13 @@ func (s *App) UpdatePort(w http.ResponseWriter, r *http.Request) { return } - conf, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root)) + conf, err := io.Read(fmt.Sprintf("%s/sites/phpmyadmin/config/nginx.conf", app.Root)) if err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return } conf = regexp.MustCompile(`listen\s+(\d+);`).ReplaceAllString(conf, "listen "+cast.ToString(req.Port)+";") - if err = io.Write(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root), conf, 0644); err != nil { + if err = io.Write(fmt.Sprintf("%s/sites/phpmyadmin/config/nginx.conf", app.Root), conf, 0644); err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return } @@ -113,7 +113,7 @@ func (s *App) UpdatePort(w http.ResponseWriter, r *http.Request) { } func (s *App) GetConfig(w http.ResponseWriter, r *http.Request) { - config, err := io.Read(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root)) + config, err := io.Read(fmt.Sprintf("%s/sites/phpmyadmin/config/nginx.conf", app.Root)) if err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return @@ -129,7 +129,7 @@ func (s *App) UpdateConfig(w http.ResponseWriter, r *http.Request) { return } - if err = io.Write(fmt.Sprintf("%s/server/vhost/phpmyadmin.conf", app.Root), req.Config, 0644); err != nil { + if err = io.Write(fmt.Sprintf("%s/sites/phpmyadmin/config/nginx.conf", app.Root), req.Config, 0644); err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return } diff --git a/internal/data/cert.go b/internal/data/cert.go index 1ae8a6d3..8bdc9881 100644 --- a/internal/data/cert.go +++ b/internal/data/cert.go @@ -174,7 +174,7 @@ func (r *certRepo) ObtainAuto(id uint) (*acme.Certificate, error) { return nil, errors.New(r.t.Get("wildcard domains cannot use HTTP verification")) } } - conf := fmt.Sprintf("%s/server/vhost/acme/%s.conf", app.Root, cert.Website.Name) + conf := fmt.Sprintf("%s/sites/%s/config/site/001-acme.conf", app.Root, cert.Website.Name) client.UseHTTP(conf) } } @@ -306,7 +306,7 @@ func (r *certRepo) Renew(id uint) (*acme.Certificate, error) { return nil, errors.New(r.t.Get("wildcard domains cannot use HTTP verification")) } } - conf := fmt.Sprintf("%s/server/vhost/acme/%s.conf", app.Root, cert.Website.Name) + conf := fmt.Sprintf("%s/sites/%s/config/site/001-acme.conf", app.Root, cert.Website.Name) client.UseHTTP(conf) } } @@ -403,11 +403,10 @@ func (r *certRepo) Deploy(ID, WebsiteID uint) error { if err = r.db.Where("id", WebsiteID).First(website).Error; err != nil { return err } - - if err = io.Write(fmt.Sprintf("%s/server/vhost/cert/%s.pem", app.Root, website.Name), cert.Cert, 0644); err != nil { + if err = io.Write(fmt.Sprintf("%s/sites/%s/config/fullchain.pem", app.Root, website.Name), cert.Cert, 0644); err != nil { return err } - if err = io.Write(fmt.Sprintf("%s/server/vhost/cert/%s.key", app.Root, website.Name), cert.Key, 0644); err != nil { + if err = io.Write(fmt.Sprintf("%s/sites/%s/config/private.key", app.Root, website.Name), cert.Key, 0644); err != nil { return err } if err = systemctl.Reload("nginx"); err != nil { diff --git a/internal/data/website.go b/internal/data/website.go index e8981ca2..e838a5de 100644 --- a/internal/data/website.go +++ b/internal/data/website.go @@ -157,7 +157,7 @@ func (r *websiteRepo) Get(id uint) (*types.WebsiteSetting, error) { // 证书 crt, _ := io.Read(filepath.Join(app.Root, "sites", website.Name, "config", "fullchain.pem")) setting.SSLCert = crt - key, _ := io.Read(filepath.Join(app.Root, "sites", website.Name, "config", "privatekey.key")) + key, _ := io.Read(filepath.Join(app.Root, "sites", website.Name, "config", "private.key")) setting.SSLKey = key // 解析证书信息 if decode, err := cert.ParseCert(crt); err == nil { @@ -384,7 +384,7 @@ location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.env) { if err = io.Write(filepath.Join(app.Root, "sites", req.Name, "config", "fullchain.pem"), "", 0644); err != nil { return nil, err } - if err = io.Write(filepath.Join(app.Root, "sites", req.Name, "config", "privatekey.key"), "", 0644); err != nil { + if err = io.Write(filepath.Join(app.Root, "sites", req.Name, "config", "private.key"), "", 0644); err != nil { return nil, err } @@ -481,7 +481,7 @@ func (r *websiteRepo) Update(req *request.WebsiteUpdate) error { website.Path = req.Path // SSL certPath := filepath.Join(app.Root, "sites", website.Name, "config", "fullchain.pem") - keyPath := filepath.Join(app.Root, "sites", website.Name, "config", "privatekey.key") + keyPath := filepath.Join(app.Root, "sites", website.Name, "config", "private.key") if err = io.Write(certPath, req.SSLCert, 0644); err != nil { return err } @@ -668,7 +668,7 @@ func (r *websiteRepo) ResetConfig(id uint) error { if err = io.Write(filepath.Join(app.Root, "sites", website.Name, "config", "fullchain.pem"), "", 0644); err != nil { return err } - if err = io.Write(filepath.Join(app.Root, "sites", website.Name, "config", "privatekey.key"), "", 0644); err != nil { + if err = io.Write(filepath.Join(app.Root, "sites", website.Name, "config", "private.key"), "", 0644); err != nil { return err } // PHP 网站默认伪静态 @@ -726,7 +726,7 @@ func (r *websiteRepo) UpdateCert(req *request.WebsiteUpdateCert) error { } certPath := filepath.Join(app.Root, "sites", website.Name, "config", "fullchain.pem") - keyPath := filepath.Join(app.Root, "sites", website.Name, "config", "privatekey.key") + keyPath := filepath.Join(app.Root, "sites", website.Name, "config", "private.key") if err := io.Write(certPath, req.Cert, 0644); err != nil { return err }