Merge remote-tracking branch 'origin/main'

go.mod

@@ -3,7 +3,7 @@ module github.com/acepanel/panel/v3
 go 1.26.0
 
 require (
-	github.com/DeRuina/timberjack v1.3.9
+	github.com/DeRuina/timberjack v1.4.0
 	github.com/andybalholm/brotli v1.2.0
 	github.com/bddjr/hlfhr v1.5.0
 	github.com/beevik/ntp v1.5.0

go.sum

@@ -15,8 +15,8 @@ filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
 filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DeRuina/timberjack v1.3.9 h1:6UXZ1I7ExPGTX/1UNYawR58LlOJUHKBPiYC7WQ91eBo=
-github.com/DeRuina/timberjack v1.3.9/go.mod h1:RLoeQrwrCGIEF8gO5nV5b/gMD0QIy7bzQhBUgpp1EqE=
+github.com/DeRuina/timberjack v1.4.0 h1:Ipw9KjS/6K6A9D1xdhWebYJFqdQez5gXwfzmeKOroqE=
+github.com/DeRuina/timberjack v1.4.0/go.mod h1:RLoeQrwrCGIEF8gO5nV5b/gMD0QIy7bzQhBUgpp1EqE=
 github.com/G-Core/gcore-dns-sdk-go v0.3.3 h1:McILJSbJ5nOcT0MI0aBYhEuufCF329YbqKwFIN0RjCI=
 github.com/G-Core/gcore-dns-sdk-go v0.3.3/go.mod h1:35t795gOfzfVanhzkFyUXEzaBuMXwETmJldPpP28MN4=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=

pkg/embed/locales/backend.pot

@@ -632,10 +632,10 @@ msgstr ""
 msgid "Index Hit Rate"
 msgstr ""
 
-#: internal/service/cli.go:1062
-#: internal/service/cli.go:1067
-#: internal/service/cli.go:1072
-#: internal/service/cli.go:1112
+#: internal/service/cli.go:1061
+#: internal/service/cli.go:1066
+#: internal/service/cli.go:1071
+#: internal/service/cli.go:1111
 msgid "Initialization failed: %v"
 msgstr ""
 
@@ -1510,7 +1510,7 @@ msgstr ""
 msgid "can't download a directory"
 msgstr ""
 
-#: internal/data/website.go:551
+#: internal/data/website.go:547
 msgid "can't find %s database server, please add it first"
 msgstr ""
 
@@ -1671,7 +1671,7 @@ msgstr ""
 msgid "failed to create database user on remote: %v"
 msgstr ""
 
-#: internal/service/ws.go:231
+#: internal/service/ws.go:228
 msgid "failed to create docker client: %v"
 msgstr ""
 
@@ -1735,7 +1735,7 @@ msgstr ""
 msgid "failed to enable %s service: %v"
 msgstr ""
 
-#: internal/service/ws.go:245
+#: internal/service/ws.go:242
 msgid "failed to encode auth: %v"
 msgstr ""
 
@@ -1878,7 +1878,7 @@ msgstr ""
 msgid "failed to get home apps: %v"
 msgstr ""
 
-#: internal/data/website.go:446
+#: internal/data/website.go:442
 msgid "failed to get index template file: %v"
 msgstr ""
 
@@ -2014,8 +2014,8 @@ msgstr ""
 #: internal/data/cert.go:102
 #: internal/data/setting.go:338
 #: internal/data/setting.go:412
-#: internal/data/website.go:620
-#: internal/data/website.go:969
+#: internal/data/website.go:616
+#: internal/data/website.go:963
 msgid "failed to parse certificate: %v"
 msgstr ""
 
@@ -2026,8 +2026,8 @@ msgstr ""
 #: internal/data/cert.go:105
 #: internal/data/setting.go:341
 #: internal/data/setting.go:415
-#: internal/data/website.go:623
-#: internal/data/website.go:972
+#: internal/data/website.go:619
+#: internal/data/website.go:966
 msgid "failed to parse private key: %v"
 msgstr ""
 
@@ -2051,7 +2051,7 @@ msgstr ""
 msgid "failed to parse version: %v"
 msgstr ""
 
-#: internal/service/ws.go:254
+#: internal/service/ws.go:251
 msgid "failed to pull image: %v"
 msgstr ""
 
@@ -2076,7 +2076,7 @@ msgstr ""
 msgid "failed to read generated key: %v"
 msgstr ""
 
-#: internal/service/ws.go:219
+#: internal/service/ws.go:216
 msgid "failed to read params: %v"
 msgstr ""
 
@@ -2196,7 +2196,7 @@ msgstr ""
 msgid "failed to start %s service: %v"
 msgstr ""
 
-#: internal/service/ws.go:192
+#: internal/service/ws.go:190
 msgid "failed to start container terminal: %v"
 msgstr ""
 
@@ -2317,7 +2317,7 @@ msgstr ""
 msgid "invalid logical volume size"
 msgstr ""
 
-#: internal/service/ws.go:224
+#: internal/service/ws.go:221
 msgid "invalid params: %v"
 msgstr ""
 
@@ -2368,7 +2368,7 @@ msgstr ""
 msgid "log file %s not exists"
 msgstr ""
 
-#: internal/data/website.go:1124
+#: internal/data/website.go:1118
 msgid "maximum number of custom configurations reached (limit: %d)"
 msgstr ""
 
@@ -2564,7 +2564,7 @@ msgstr ""
 msgid "running"
 msgstr ""
 
-#: internal/data/website.go:598
+#: internal/data/website.go:594
 msgid "runtime directory does not exist"
 msgstr ""
 
@@ -2691,7 +2691,7 @@ msgstr ""
 msgid "this certificate is not associated with a website and cannot be obtained. You can try to obtain it manually"
 msgstr ""
 
-#: internal/data/cert.go:529
+#: internal/data/cert.go:527
 msgid "this certificate is not associated with an ACME account and cannot be obtained"
 msgstr ""
 
@@ -2756,13 +2756,13 @@ msgstr ""
 msgid "unsupported system"
 msgstr ""
 
-#: internal/data/website.go:1226
-#: internal/data/website.go:1280
+#: internal/data/website.go:1220
+#: internal/data/website.go:1274
 msgid "unsupported web server: %s"
 msgstr ""
 
-#: internal/data/cert.go:492
-#: internal/data/website.go:1192
+#: internal/data/cert.go:490
+#: internal/data/website.go:1186
 msgid "unsupported website type: %s"
 msgstr ""
 
@@ -2846,11 +2846,11 @@ msgstr ""
 msgid "webhook script not found"
 msgstr ""
 
-#: internal/data/website.go:805
+#: internal/data/website.go:799
 msgid "website %s has bound certificates, please delete the certificate first"
 msgstr ""
 
-#: internal/data/website.go:605
+#: internal/data/website.go:601
 msgid "website directory does not exist"
 msgstr ""
 
@@ -2863,7 +2863,7 @@ msgstr ""
 msgid "wildcard domains cannot use HTTP verification"
 msgstr ""
 
-#: internal/data/website.go:1002
+#: internal/data/website.go:996
 msgid "wildcard domains require DNS verification, please select a DNS provider"
 msgstr ""
 

web/pnpm-lock.yaml

@@ -197,7 +197,7 @@ importers:
         version: 7.3.1(@types/node@24.12.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
       vite-plugin-compression2:
         specifier: ^2.4.0
-        version: 2.5.0(rollup@4.59.0)
+        version: 2.5.1(rollup@4.59.0)
       vite-plugin-html:
         specifier: ^3.2.2
         version: 3.2.2(vite@7.3.1(@types/node@24.12.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
@@ -3210,8 +3210,8 @@ packages:
     peerDependencies:
       vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0
 
-  vite-plugin-compression2@2.5.0:
-    resolution: {integrity: sha512-bHxtBibPxxSn5eZSe0IAzvYucP/hg8Bz8ppjbH7lndU5kIHT+92qTkB4z9xWYfnyV0YHuir1SjOuyO0fzU4Vgg==}
+  vite-plugin-compression2@2.5.1:
+    resolution: {integrity: sha512-2YpLZWs1ZRo9XwtSFA6/NVuBgOR+kvFk8M0HNDsP7Wu7OfJDOKT6fHB8kzuvw6jhgC9KYgDOttfaG2qC0wE9AQ==}
 
   vite-plugin-html@3.2.2:
     resolution: {integrity: sha512-vb9C9kcdzcIo/Oc3CLZVS03dL5pDlOFuhGlZYDCJ840BhWl/0nGeZWf3Qy7NlOayscY4Cm/QRgULCQkEZige5Q==}
@@ -6552,7 +6552,7 @@ snapshots:
     dependencies:
       vite: 7.3.1(@types/node@24.12.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
 
-  vite-plugin-compression2@2.5.0(rollup@4.59.0):
+  vite-plugin-compression2@2.5.1(rollup@4.59.0):
     dependencies:
       '@rollup/pluginutils': 5.3.0(rollup@4.59.0)
       tar-mini: 0.2.0