From 88daebbb75daae27d9bcb52ff7a88337e8a26466 Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Mon, 10 Apr 2023 11:03:15 +0800 Subject: [PATCH] enhance: rm acme-challenge if auto-renewal off #30 --- frontend/src/version.json | 2 +- frontend/src/views/domain/DomainEdit.vue | 7 +- frontend/src/views/domain/cert/Cert.vue | 8 +- frontend/src/views/domain/cert/IssueCert.vue | 39 ++++- .../views/domain/ngx_conf/NgxConfigEditor.vue | 4 +- frontend/version.json | 2 +- .../nginx/sites-available/homework.jackyu.cn | 136 +++++++++--------- .../development/nginx/sites-available/ojbk.me | 13 ++ .../nginx/sites-available/qi.jackyu.cn | 53 ++++--- .../development/nginx/sites-available/test | 24 ++++ .../nginx/sites-enabled/amstourship.jackyu.cn | 1 - .../nginx/sites-enabled/homework.jackyu.cn | 1 + .../nginx/sites-enabled/qi.jackyu.cn | 1 + .../development/nginx/sites-enabled/test | 1 + .../ssl/homework.jackyu.cn/fullchain.cer | 64 +++++++++ .../nginx/ssl/homework.jackyu.cn/private.key | 27 ++++ .../nginx/ssl/ojbk.me/fullchain.cer | 64 +++++++++ .../development/nginx/ssl/ojbk.me/private.key | 27 ++++ .../nginx/ssl/qi.jackyu.cn/fullchain.cer | 64 +++++++++ .../nginx/ssl/qi.jackyu.cn/private.key | 27 ++++ .../fullchain.cer | 64 +++++++++ .../private.key | 27 ++++ .../nginx/ssl/test.jackyu.cn/fullchain.cer | 64 +++++++++ .../nginx/ssl/test.jackyu.cn/private.key | 27 ++++ server/api/template.go | 16 --- server/service/template.go | 2 + template/block/letsencrypt.conf | 13 ++ 27 files changed, 651 insertions(+), 127 deletions(-) create mode 100644 resources/development/nginx/sites-available/test delete mode 120000 resources/development/nginx/sites-enabled/amstourship.jackyu.cn create mode 120000 resources/development/nginx/sites-enabled/homework.jackyu.cn create mode 120000 resources/development/nginx/sites-enabled/qi.jackyu.cn create mode 120000 resources/development/nginx/sites-enabled/test create mode 100644 resources/development/nginx/ssl/homework.jackyu.cn/fullchain.cer create mode 100644 resources/development/nginx/ssl/homework.jackyu.cn/private.key create mode 100644 resources/development/nginx/ssl/ojbk.me/fullchain.cer create mode 100644 resources/development/nginx/ssl/ojbk.me/private.key create mode 100644 resources/development/nginx/ssl/qi.jackyu.cn/fullchain.cer create mode 100644 resources/development/nginx/ssl/qi.jackyu.cn/private.key create mode 100644 resources/development/nginx/ssl/qi.jackyu.cn_amstourship.jackyu.cn/fullchain.cer create mode 100644 resources/development/nginx/ssl/qi.jackyu.cn_amstourship.jackyu.cn/private.key create mode 100644 resources/development/nginx/ssl/test.jackyu.cn/fullchain.cer create mode 100644 resources/development/nginx/ssl/test.jackyu.cn/private.key create mode 100644 template/block/letsencrypt.conf diff --git a/frontend/src/version.json b/frontend/src/version.json index dea0a5d..09e0afa 100644 --- a/frontend/src/version.json +++ b/frontend/src/version.json @@ -1 +1 @@ -{"version":"1.7.9","build_id":87,"total_build":157} \ No newline at end of file +{"version":"1.7.9","build_id":88,"total_build":158} \ No newline at end of file diff --git a/frontend/src/views/domain/DomainEdit.vue b/frontend/src/views/domain/DomainEdit.vue index e72ec40..69436c6 100644 --- a/frontend/src/views/domain/DomainEdit.vue +++ b/frontend/src/views/domain/DomainEdit.vue @@ -4,7 +4,7 @@ import CodeEditor from '@/components/CodeEditor/CodeEditor.vue' import NgxConfigEditor from '@/views/domain/ngx_conf/NgxConfigEditor' import {useGettext} from 'vue3-gettext' -import {computed, reactive, ref, watch} from 'vue' +import {computed, provide, reactive, ref, watch} from 'vue' import {useRoute, useRouter} from 'vue-router' import domain from '@/api/domain' import ngx from '@/api/ngx' @@ -124,7 +124,7 @@ const save = async () => { } } - domain.save(name.value, { + await domain.save(name.value, { name: filename.value || name.value, content: configText.value, overwrite: true }).then(r => { @@ -134,7 +134,6 @@ const save = async () => { }).catch(handle_parse_error).finally(() => { saving.value = false }) - } function enable() { @@ -165,6 +164,8 @@ function on_change_enabled(checked: boolean) { const editor_md = computed(() => history_chatgpt_record?.value?.length > 1 ? 16 : 24) const chat_md = computed(() => history_chatgpt_record?.value?.length > 1 ? 8 : 24) + +provide('save_site_config', save)