1 parent
62fb971b52
commit
a85d42bb70
2 files changed
+9
-16
No files matched your search
@@ -91,7 +91,7 @@ export function usePage() {
|
|||||||
|
|
||||||
const sslSettings = reactive({
|
const sslSettings = reactive({
|
||||||
"type": "0",
|
"type": "0",
|
||||||
"challenge": "http",
|
"challenge": "dns",
|
||||||
"key_path": "./config/ssl/private.key",
|
"key_path": "./config/ssl/private.key",
|
||||||
"crt_path": "./config/ssl/public.crt",
|
"crt_path": "./config/ssl/public.crt",
|
||||||
"paramsList": [],
|
"paramsList": [],
|
||||||
@@ -123,8 +123,7 @@ export function usePage() {
|
|||||||
records.some((record) => record.type === 'AAAA')
|
records.some((record) => record.type === 'AAAA')
|
||||||
))
|
))
|
||||||
|
|
||||||
const port = ref(80)
|
const sslRuntime = ref({})
|
||||||
const sslRuntime = ref({})
|
|
||||||
|
|
||||||
const addDomain = () => {
|
const addDomain = () => {
|
||||||
domainSettings.multi_domain.push([])
|
domainSettings.multi_domain.push([])
|
||||||
@@ -355,9 +354,11 @@ export function usePage() {
|
|||||||
sslSettings.type = "0"
|
sslSettings.type = "0"
|
||||||
sslSettings.challenge = "dns"
|
sslSettings.challenge = "dns"
|
||||||
}
|
}
|
||||||
|
if (sslSettings.type === "0") {
|
||||||
|
sslSettings.challenge = "dns"
|
||||||
|
}
|
||||||
sslRuntime.value = res.data || {}
|
sslRuntime.value = res.data || {}
|
||||||
port.value = res.data?.port || res.data?.httpPort || 80
|
return res
|
||||||
return res
|
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
showSetupError(error)
|
showSetupError(error)
|
||||||
return null
|
return null
|
||||||
@@ -368,7 +369,7 @@ export function usePage() {
|
|||||||
fullscreenLoading.value = true;
|
fullscreenLoading.value = true;
|
||||||
|
|
||||||
let sslType = sslSettings.type;
|
let sslType = sslSettings.type;
|
||||||
if (sslType === "0" && sslSettings.challenge === "dns") {
|
if (sslType === "0") {
|
||||||
sslType = "2"
|
sslType = "2"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -717,8 +718,7 @@ export function usePage() {
|
|||||||
dnsChallengeNotice,
|
dnsChallengeNotice,
|
||||||
dnsInfos,
|
dnsInfos,
|
||||||
hasDNSIPv6,
|
hasDNSIPv6,
|
||||||
port,
|
addDomain,
|
||||||
addDomain,
|
|
||||||
setPassword,
|
setPassword,
|
||||||
getPassword,
|
getPassword,
|
||||||
getDbConfig,
|
getDbConfig,
|
||||||
|
|||||||
@@ -278,11 +278,6 @@
|
|||||||
<div class="desc">
|
<div class="desc">
|
||||||
<div class="ssl-title-row">
|
<div class="ssl-title-row">
|
||||||
<h2>{{ lang.setSSL }}</h2>
|
<h2>{{ lang.setSSL }}</h2>
|
||||||
<div v-if="sslSettings.type === '0' && sslSettings.challenge === 'http' && port !== 80"
|
|
||||||
class="ssl-port-warning" role="alert">
|
|
||||||
<strong>{{ lang.warning }}</strong>
|
|
||||||
<span>{{ lang.autoSSLWarn }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="ssl-title-description">{{ lang.setSSL }}</div>
|
<div class="ssl-title-description">{{ lang.setSSL }}</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -298,9 +293,8 @@
|
|||||||
|
|
||||||
<el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type === '0'">
|
<el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type === '0'">
|
||||||
<div class="ssl-challenge-select-row">
|
<div class="ssl-challenge-select-row">
|
||||||
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge"
|
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto_dns" v-model="sslSettings.challenge"
|
||||||
:disabled="fullscreenLoading" @change="handleSSLChallengeChange">
|
:disabled="fullscreenLoading" @change="handleSSLChallengeChange">
|
||||||
<el-option :label="lang.ssl_auto_http" value="http"/>
|
|
||||||
<el-option :label="lang.ssl_auto_dns" value="dns"/>
|
<el-option :label="lang.ssl_auto_dns" value="dns"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
|
||||||
@@ -403,7 +397,6 @@ const {
|
|||||||
dnsInfos,
|
dnsInfos,
|
||||||
hasDNSIPv6,
|
hasDNSIPv6,
|
||||||
sslSettings,
|
sslSettings,
|
||||||
port,
|
|
||||||
dnsChecking,
|
dnsChecking,
|
||||||
dnsChallengeNotice,
|
dnsChallengeNotice,
|
||||||
waitDesc,
|
waitDesc,
|
||||||
|
|||||||
Reference in new issue
Block a user