diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go index 85ade74b3606..5f3662edbdfc 100644 --- a/agent/app/service/website_utils.go +++ b/agent/app/service/website_utils.go @@ -1233,7 +1233,7 @@ func saveCertificateFile(websiteSSL *model.WebsiteSSL, logger *log.Logger) { func GetSystemSSL() (bool, uint) { var sslSetting model.Setting _ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSL").First(&sslSetting).Error - if sslSetting.Value == "Enable" { + if sslSetting.Value == "Enable" || sslSetting.Value == "Mux" { var sslIDSetting model.Setting _ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSLID").First(&sslIDSetting).Error idValue, _ := strconv.Atoi(sslIDSetting.Value) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index a8f950900b92..4a33f36ee51d 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -2031,7 +2031,7 @@ const message = { https: 'Setting HTTPS for the panel improves access security', strictHelper: 'Non-HTTPS traffic cannot connect to the panel', muxHelper: - 'The panel will listen on both HTTP and HTTPS ports and redirect HTTP to HTTPS, but this may reduce security', + "The panel will listen on both HTTP and HTTPS protocols and redirect HTTP traffic to HTTPS, but this may reduce the panel's security", certType: 'Certificate type', selfSigned: 'Self signed', selfSignedHelper: `Browsers may not trust self-signed certificates and may display security warnings.`, diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index afaa8c83ed23..c7afb88d20f1 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -2046,7 +2046,7 @@ const message = { https: 'Configurar HTTPS para el panel mejora la seguridad de acceso', strictHelper: 'El tráfico no HTTPS no puede conectarse al panel', muxHelper: - 'El panel escuchará en los puertos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad', + 'El panel escuchará en los protocolos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad del panel', certType: 'Tipo de certificado', selfSigned: 'Autofirmado', selfSignedHelper: diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 5fd38c1add29..0ddd2171cdd2 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -1955,7 +1955,7 @@ const message = { https: 'パネルにHTTPSを設定するとアクセスセキュリティが向上します', strictHelper: 'HTTPS以外のトラフィックはパネルに接続できません', muxHelper: - 'パネルはHTTPポートとHTTPSポートの両方を監視し、HTTPをHTTPSにリダイレクトしますが、セキュリティが低下する可能性があります', + 'パネルはHTTPピュロコールとHTTPSピュロコールの両方を監視し、HTTPをHTTPSにリダイレクトしますが、このモードではパネルのセキュリティが低下する可能性があります', certType: '証明書の種類', selfSigned: '自己署名', selfSignedHelper: `ブラウザは、自己署名の証明書を信頼していない場合があり、セキュリティ警告を表示する場合があります。`, diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 3dfda945583c..2dc5dcf34cdc 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -1923,7 +1923,8 @@ const message = { https: '패널에 HTTPS를 설정하면 액세스 보안이 향상됩니다', strictHelper: '비 HTTPS 트래픽은 패널에 연결할 수 없습니다', - muxHelper: '패널은 HTTP 및 HTTPS 포트 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다', + muxHelper: + '패널은 HTTP 및 HTTPS 프로토콜 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다', certType: '인증서 유형', selfSigned: '자가 서명', selfSignedHelper: '자가 서명 인증서는 브라우저에서 신뢰하지 않을 수 있으며 보안 경고가 표시될 수 있습니다.', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index e2866a0287ff..e8a462373810 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -2013,7 +2013,7 @@ const message = { https: 'Mengatur HTTPS untuk panel meningkatkan keselamatan akses', strictHelper: 'Trafik bukan HTTPS tidak boleh menyambung ke panel', muxHelper: - 'Panel akan mendengar pada kedua-dua port HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan', + 'Panel akan mendengar pada kedua-dua protokol HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan panel', certType: 'Jenis sijil', selfSigned: 'Diterbitkan sendiri', selfSignedHelper: diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index df57980dfe60..f5efe6700e80 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -2001,7 +2001,7 @@ const message = { https: 'Configurar HTTPS para o painel melhora a segurança de acesso', strictHelper: 'Tráfego não HTTPS não pode se conectar ao painel', muxHelper: - 'O painel ouvirá nas portas HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança', + 'O painel ouvirá nas protocolos HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança do painel', certType: 'Tipo de certificado', selfSigned: 'Autoassinado', selfSignedHelper: diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 6056996a0d40..da8632fa9068 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -1999,7 +1999,7 @@ const message = { https: 'Настройка HTTPS для панели повышает безопасность доступа', strictHelper: 'Трафик без HTTPS не может подключиться к панели', muxHelper: - 'Панель будет прослушивать порты HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность', + 'Панель будет прослушивать протоколы HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность панели', certType: 'Тип сертификата', selfSigned: 'Самоподписанный', selfSignedHelper: diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 8d3ac7247cf4..9cf7ec85e4ec 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -2053,7 +2053,7 @@ const message = { https: 'Panel için HTTPS ayarlamak erişim güvenliğini artırır', strictHelper: 'HTTPS olmayan trafik panele bağlanamaz', muxHelper: - "Panel hem HTTP hem de HTTPS portlarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, ancak bu güvenliği azaltabilir", + "Panel hem HTTP hem de HTTPS protokollarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, bu modda panel güvenliğini azaltabilir", certType: 'Sertifika türü', selfSigned: 'Kendi kendine imzalı', selfSignedHelper: diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 3fb222d1eda0..3e05c2259699 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -1977,7 +1977,7 @@ const message = { https: '為面板設置 HTTPS 可提升訪問安全性', strictHelper: '非 HTTPS 流量無法連接面板', - muxHelper: '面板將同時監聽 HTTP 和 HTTPS 端口，並將 HTTP 重定向到 HTTPS，但可能會降低安全性', + muxHelper: '面板將同時監聽 HTTP 和 HTTPS 協議，並將 HTTP 重定向到 HTTPS，此模式下可能會降低面板安全性', certType: '證書類型', selfSigned: '自簽名', selfSignedHelper: '自簽證書，不被瀏覽器信任，顯示不安全是正常現象', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index dea62f6a3b17..810cda414c7c 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1976,7 +1976,7 @@ const message = { https: '为面板设置HTTPS可提升访问安全性', strictHelper: '非 HTTPS 流量无法连接面板', - muxHelper: '面板将同时监听 HTTP 和 HTTPS 端口，并将 HTTP 重定向到 HTTPS，但可能会降低安全性', + muxHelper: '面板将同时监听 HTTP 和 HTTPS 协议，并将 HTTP 重定向到 HTTPS，此模式下可能会降低面板安全性', certType: '证书类型', selfSigned: '自签名', selfSignedHelper: '自签证书，不被浏览器信任，显示不安全是正常现象',