Skip to content

Commit e925773

Browse files
fix: fix issue with change ssl_protocols failed (#8985)
Refs #8981
1 parent 81caf12 commit e925773

File tree

10 files changed

+11
-12
lines changed

10 files changed

+11
-12
lines changed

agent/app/service/website_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ func applySSL(website *model.Website, websiteSSL model.WebsiteSSL, req request.W
761761
if param.Name == "ssl_protocols" {
762762
nginxParams[i].Params = req.SSLProtocol
763763
if len(req.SSLProtocol) == 0 {
764-
nginxParams[i].Params = []string{"TLSv1.3", "TLSv1.2", "TLSv1.1", "TLSv1"}
764+
nginxParams[i].Params = []string{"TLSv1.3", "TLSv1.2"}
765765
}
766766
}
767767
if param.Name == "ssl_ciphers" {

frontend/src/lang/modules/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3384,7 +3384,7 @@ const message = {
33843384

33853385
panelExist:
33863386
'1Panel V1 service is running on this node. Please upgrade to V2 using the migration script before adding.',
3387-
coreExist: 'This node already has 1Panel V2 service deployed and cannot be added as a secondary node.',
3387+
coreExist: 'This node has already been enabled as the main node and cannot be added as a slave node.',
33883388
agentExist:
33893389
'1panel-agent is already installed on this node. Continuing will preserve existing data and only replace the 1panel-agent service. Proceed?',
33903390
dataExist: '1Panel historical data exists on this node. Confirm to continue adding?',

frontend/src/lang/modules/ja.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3240,7 +3240,7 @@ const message = {
32403240

32413241
panelExist:
32423242
'このノードで1Panel V1サービスが実行中です。追加する前に移行スクリプトでV2にアップグレードしてください。',
3243-
coreExist: 'このノードには1Panel V2サービスがデプロイ済みのため、セカンダリノードとして追加できません。',
3243+
coreExist: 'このノードは既にメインノードとして有効になっており、スレーブノードとして追加できません。',
32443244
agentExist:
32453245
'このノードには1panel-agentがインストール済みです。続行すると既存データは保持され、1panel-agentサービスのみ置き換えられます。続行しますか?',
32463246
dataExist: 'このノードに1Panelの過去データが存在します。追加を続行しますか?',

frontend/src/lang/modules/ko.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3184,7 +3184,7 @@ const message = {
31843184

31853185
panelExist:
31863186
'이 노드에서 1Panel V1 서비스가 실행 중입니다. 추가하기 전에 마이그레이션 스크립트로 V2로 업그레이드하세요.',
3187-
coreExist: '이 노드에는 이미 1Panel V2 서비스가 배포되어 있어 보조 노드로 추가할 수 없습니다.',
3187+
coreExist: '이 노드는 이미 메인 노드로 활성화되어 있어 슬레이브 노드로 추가할 수 없습니다.',
31883188
agentExist:
31893189
'이 노드에 1panel-agent가 이미 설치되어 있습니다. 계속하면 기존 데이터는 유지되고 1panel-agent 서비스만 교체됩니다. 계속하시겠습니까?',
31903190
dataExist: '이 노드에 1Panel 이전 데이터가 존재합니다. 추가를 계속하시겠습니까?',

frontend/src/lang/modules/ms.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3311,8 +3311,7 @@ const message = {
33113311

33123312
panelExist:
33133313
'Mengesan perkhidmatan 1Panel V1 sedang berjalan pada nod ini. Sila naik taraf ke V2 menggunakan skrip migrasi sebelum menambah.',
3314-
coreExist:
3315-
'Nod ini telah mempunyai perkhidmatan 1Panel V2 dipasang, tidak boleh ditambah sebagai nod sekunder.',
3314+
coreExist: 'Node ini telah diaktifkan sebagai nod utama dan tidak boleh ditambah sebagai nod hamba.',
33163315
agentExist:
33173316
'Mengesan 1panel-agent telah dipasang pada nod ini. Jika diteruskan, data sedia ada akan dikekalkan dan hanya perkhidmatan 1panel-agent akan diganti. Teruskan?',
33183317
dataExist: 'Mengesan data sejarah 1Panel wujud pada nod ini. Sahkan untuk terus menambah?',

frontend/src/lang/modules/pt-br.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3318,7 +3318,7 @@ const message = {
33183318

33193319
panelExist:
33203320
'O serviço 1Panel V1 está em execução neste nó. Atualize para V2 usando o script de migração antes de adicionar.',
3321-
coreExist: 'Este nó já tem o serviço 1Panel V2 implantado e não pode ser adicionado como nó secundário.',
3321+
coreExist: 'Este nó já foi ativado como nó principal e não pode ser adicionado como um escravo.',
33223322
agentExist:
33233323
'1panel-agent já está instalado neste nó. Continuar preservará os dados existentes e substituirá apenas o serviço 1panel-agent. Prosseguir?',
33243324
dataExist: 'Existem dados históricos do 1Panel neste nó. Confirmar para continuar a adição?',

frontend/src/lang/modules/ru.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3305,7 +3305,7 @@ const message = {
33053305

33063306
panelExist:
33073307
'На этом узле запущена служба 1Panel V1. Перед добавлением обновитесь до V2 с помощью скрипта миграции.',
3308-
coreExist: 'На этом узле уже развернута служба 1Panel V2, поэтому его нельзя добавить как вторичный узел.',
3308+
coreExist: 'Этот узел уже активирован как основной узел и не может быть добавлен как подчиненный узел.',
33093309
agentExist:
33103310
'1panel-agent уже установлен на этом узле. Продолжение сохранит существующие данные и заменит только службу 1panel-agent. Продолжить?',
33113311
dataExist: 'На этом узле есть исторические данные 1Panel. Подтвердить продолжение добавления?',

frontend/src/lang/modules/zh-Hant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3130,7 +3130,7 @@ const message = {
31303130
nodeSyncHelper2: '2. 主節點與子節點的連接信息',
31313131

31323132
panelExist: '檢測到該節點正在運行 1Panel V1 服務,請先透過遷移腳本升級至 V2 後再進行新增。',
3133-
coreExist: '該節點已部署 1Panel V2 服務,無法作為從屬節點新增。',
3133+
coreExist: '該節點已作為主節點啟用,無法作為從節點添加。',
31343134
agentExist: '檢測到該節點已安裝 1panel-agent,繼續新增將保留現有數據,僅替換 1panel-agent 服務,是否繼續?',
31353135
dataExist: '檢測到該節點存在 1Panel 歷史數據,是否確認繼續新增?',
31363136
errLicense: '檢測到該節點綁定的許可證不可用,請檢查後重試!',

frontend/src/lang/modules/zh.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3100,7 +3100,7 @@ const message = {
31003100
nodeSyncHelper1: '1. 公用的备份账号信息',
31013101
nodeSyncHelper2: '2. 主节点与子节点的连接信息',
31023102
panelExist: '检测到该节点正在运行 1Panel V1 服务,请先通过迁移脚本升级至 V2 后再进行添加。',
3103-
coreExist: '该节点已部署 1Panel V2 服务,无法作为从节点添加。',
3103+
coreExist: '该节点已作为主节点启用,无法作为从节点添加。',
31043104
agentExist: '检测到该节点已安装 1panel-agent,继续添加将保留现有数据,仅替换 1panel-agent 服务,是否继续?',
31053105
dataExist: '检测到该节点存在 1Panel 历史数据,是否确认继续添加?',
31063106
errLicense: '检测到该节点绑定的许可证不可用,请检查后重试!',

frontend/src/views/website/website/config/basic/https/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@
144144
<el-checkbox :value="'TLSv1.3'">{{ 'TLS 1.3' }}</el-checkbox>
145145
<el-checkbox :value="'TLSv1.2'">{{ 'TLS 1.2' }}</el-checkbox>
146146
<el-checkbox :value="'TLSv1.1'">
147-
{{ 'TLS 1.0' + $t('website.notSecurity') }}
147+
{{ 'TLS 1.1' + $t('website.notSecurity') }}
148148
</el-checkbox>
149149
<el-checkbox :value="'TLSv1'">
150-
{{ 'TLS 1.1' + $t('website.notSecurity') }}
150+
{{ 'TLS 1.0' + $t('website.notSecurity') }}
151151
</el-checkbox>
152152
</el-checkbox-group>
153153
</el-form-item>

0 commit comments

Comments
 (0)