yan/mdserver-web
1
0
Fork 0
mirror of https://github.com/midoks/mdserver-web.git synced 2026-10-20 08:25:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

acme证书选择

Browse Source
This commit is contained in:
dami
2025-12-20 20:46:58 +08:00
parent 74f774bc3b
commit 25f4a815fd
3 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/utils/site.py
+20 -5
View File
@@ -2153,7 +2153,7 @@ location ^~ {from} {\n\
mw.restartWeb()
return mw.returnData(True, '删除成功')
def createAcmeFile(self, site_name, domains, email, force, renew):
def createAcmeFile(self, site_name, apply_ca, domains, email, force, renew):
site_conf = self.getHostConf(site_name)
if not os.path.exists(site_conf):
return mw.returnData(False, '配置异常!')
@@ -2204,6 +2204,13 @@ location ^~ {from} {\n\
self.writeAcmeLog('开始ACME申请...')
log_file = self.acmeLogFile()
if apply_ca == "let":
cmd = cmd + " --server letsencrypt "
else if apply_ca == "let":
cmd = cmd + " --server zerossl "
else if apply_ca == "let":
cmd = cmd + " --server buypass "
cmd = 'export ACCOUNT_EMAIL=' + email + ' && ' + cmd + ' >> ' + log_file
# print(cmd)
result = mw.execShell(cmd)
@@ -2362,7 +2369,7 @@ export PATH
mw.restartWeb()
return mw.returnData(True, '证书已更新!', result)
def createAcmeDns(self, site_name, domains, email, dnspai, wildcard_domain, force, renew, dns_alias):
def createAcmeDns(self, site_name, apply_ca, domains, email, dnspai, wildcard_domain, force, renew, dns_alias):
dnsapi_option = thisdb.getOptionByJson('dnsapi', default={})
log_file = self.acmeLogFile()
cmd = 'echo "..." > '+ log_file
@@ -2399,6 +2406,14 @@ export PATH
if dns_alias != '':
cmd += ' --domain-alias '+str(dns_alias)
if apply_ca == "let":
cmd = cmd + " --server letsencrypt "
else if apply_ca == "let":
cmd = cmd + " --server zerossl "
else if apply_ca == "let":
cmd = cmd + " --server buypass "
cmd += ' > ' + log_file
# print(cmd)
@@ -2448,7 +2463,7 @@ export PATH
mw.restartWeb()
return mw.returnData(True, '证书已更新!', result)
def createAcme(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain, dns_alias):
def createAcme(self, site_name, domains, force, renew, apply_type, apply_ca, dnspai, email, wildcard_domain, dns_alias):
domains = json.loads(domains)
if len(domains) < 1:
return mw.returnData(False, '请选择域名')
@@ -2474,9 +2489,9 @@ export PATH
return mw.returnData(False, '正在申请或更新SSL中...')
if apply_type == 'file':
return self.createAcmeFile(site_name, domains, email,force,renew)
return self.createAcmeFile(site_name, apply_ca, domains, email,force,renew)
elif apply_type == 'dns':
return self.createAcmeDns(site_name, domains, email, dnspai, wildcard_domain,force, renew, dns_alias)
return self.createAcmeDns(site_name, apply_ca,domains, email, dnspai, wildcard_domain,force, renew, dns_alias)
return mw.returnData(False, '异常请求')
def createLet(self, site_name, domains, force, renew, apply_type, dnspai, email, wildcard_domain):