diff --git a/README.md b/README.md index 9cff6e267..56904797d 100644 --- a/README.md +++ b/README.md @@ -98,15 +98,12 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443: ``` -### 版本更新 0.12.3 - -* 优先使用firewalld防火墙。 -* PHP[APT]加入curl扩展。 -* 配置添加【未认证响应状态】功能。 -* 存在ipv6时,启动时强制开启。 -* OP防火墙-性能优化。 -* 网站统计优化。 -* 优化backup_ftp插件。 +### 版本更新 0.13.0 + +* 一键迁移插件。 +* 修复acme ssl申请。 +* IP识别优化。 +* 解决删除站点残留的问题。 * 各种细节优化。 ### JSDelivr安装地址 diff --git a/class/core/config_api.py b/class/core/config_api.py index 62b96db1c..735930d1d 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ from flask import request class config_api: - __version = '0.12.3' + __version = '0.13.0' __api_addr = 'data/api.json' def __init__(self): diff --git a/class/core/mw.py b/class/core/mw.py index aeb23265c..f8b6621d0 100755 --- a/class/core/mw.py +++ b/class/core/mw.py @@ -1233,7 +1233,7 @@ def makeConf(): file = getRunDir() + '/data/json/config.json' if not os.path.exists(file): c = {} - c['title'] = '大圣面板' + c['title'] = '金蝉面板' c['home'] = 'http://github/midoks/mdserver-web' c['recycle_bin'] = True c['template'] = 'default' diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py index 4300e0caa..c28f8ef36 100755 --- a/plugins/migration_api/index.py +++ b/plugins/migration_api/index.py @@ -456,8 +456,8 @@ class classApi: # return False s_files = [ - # [self.__VHOST_PATH + - # '/nginx/vhost/{}.conf'.format(siteInfo['name']), "网站配置文件"], + [self.__VHOST_PATH + + '/nginx/vhost/{}.conf'.format(siteInfo['name']), "网站配置文件"], [self.__VHOST_PATH + '/nginx/pass/{}.conf'.format(siteInfo['name']), "PASS"], [self.__VHOST_PATH + @@ -466,11 +466,15 @@ class classApi: '/nginx/redirect/{}'.format(siteInfo['name']), "重定向配置"], [self.__VHOST_PATH + '/nginx/proxy/{}'.format(siteInfo['name']), "反向代理配置"], - # [self.__VHOST_PATH + - # "/letsencrypt/{}".format(siteInfo['name']), "网站SSL证书"], - # [self.__VHOST_PATH + "/ssl/{}".format(siteInfo['name']), "网站SSL证书"] + [self.__VHOST_PATH + + "/letsencrypt/{}".format(siteInfo['name']), "网站[LETS]SSL证书"], + # [self.__VHOST_PATH + "/ssl/{}".format(siteInfo['name']), "网站SSL证书"], ] + if not mw.isAppleSystem(): + acme_dir = mw.getAcmeDomainDir(siteInfo['name']) + s_files.append([acme_dir, "网站[ACME]SSL证书"]) + self.send_list(s_files) if not self.send_file_list(siteInfo['path'], siteInfo['path']):