|
|
|
@ -566,7 +566,6 @@ class site_api: |
|
|
|
|
|
|
|
|
|
# 写入配置文件 |
|
|
|
|
result = self.setSslConf(siteName) |
|
|
|
|
# print result['msg'] |
|
|
|
|
if not result['status']: |
|
|
|
|
return mw.getJson(result) |
|
|
|
|
|
|
|
|
@ -677,12 +676,9 @@ class site_api: |
|
|
|
|
if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)): |
|
|
|
|
return mw.returnJson(False, '已部署ACME') |
|
|
|
|
|
|
|
|
|
# file = self.getHostConf(site_name) |
|
|
|
|
# content = mw.readFile(file) |
|
|
|
|
# key_text = 'ssl_certificate' |
|
|
|
|
# status = True |
|
|
|
|
# if content.find(key_text) == -1: |
|
|
|
|
# status = False |
|
|
|
|
result = self.setSslConf(siteName) |
|
|
|
|
if not result['status']: |
|
|
|
|
return mw.getJson(result) |
|
|
|
|
|
|
|
|
|
return mw.returnJson(True, '部署成功') |
|
|
|
|
|
|
|
|
|