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

up

Browse Source
This commit is contained in:
midoks
2023-02-24 05:38:59 +08:00
parent 1abb611c3e
commit 4acae8e5f5
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/core/files_api.py
+1 -1
View File
@@ -708,7 +708,7 @@ class files_api:
return not path in nDirs return not path in nDirs
def getDirSize(self, path): def getDirSize(self, path):
if mw.getOs() == 'darwin': if mw.isAppleSystem():
tmp = mw.execShell('du -sh ' + path) tmp = mw.execShell('du -sh ' + path)
else: else:
tmp = mw.execShell('du -sbh ' + path) tmp = mw.execShell('du -sbh ' + path)
plugins/migration_api/index.py
+13 -2
View File
@@ -361,6 +361,12 @@ class classApi:
self.send_file_list(f[0], f[0]) self.send_file_list(f[0], f[0])
def send_file_list(self, spath, dpath): def send_file_list(self, spath, dpath):
if os.path.islink(spath):
dpath = os.readlink(spath)
mw.buildSoftLink(spath, dpath, True)
return True
if not os.path.isdir(spath): if not os.path.isdir(spath):
return self.upload_file(spath, dpath, True) return self.upload_file(spath, dpath, True)
@@ -468,13 +474,17 @@ class classApi:
'/nginx/proxy/{}'.format(siteInfo['name']), "反向代理配置"], '/nginx/proxy/{}'.format(siteInfo['name']), "反向代理配置"],
[self.__VHOST_PATH + [self.__VHOST_PATH +
"/letsencrypt/{}".format(siteInfo['name']), "网站[LETS]SSL证书"], "/letsencrypt/{}".format(siteInfo['name']), "网站[LETS]SSL证书"],
# [self.__VHOST_PATH + "/ssl/{}".format(siteInfo['name']), "网站SSL证书"],
] ]
if not mw.isAppleSystem(): if not mw.isAppleSystem():
acme_dir = mw.getAcmeDomainDir(siteInfo['name']) acme_dir = mw.getAcmeDomainDir(siteInfo['name'])
s_files.append([acme_dir, "网站[ACME]SSL证书"]) s_files.append([acme_dir, "网站[ACME]SSL证书"])
s_files.append(
[self.__VHOST_PATH + "/ssl/{}/fullchain.pem".format(siteInfo['name']), "网站SSL[fullchain]证书"])
s_files.append(
[self.__VHOST_PATH + "/ssl/{}/privkey.pem".format(siteInfo['name']), "网站SSL[privkey]证书"])
self.send_list(s_files) self.send_list(s_files)
if not self.send_file_list(siteInfo['path'], siteInfo['path']): if not self.send_file_list(siteInfo['path'], siteInfo['path']):
@@ -772,7 +782,8 @@ class classApi:
def run(self): def run(self):
# 开始迁移 # 开始迁移
# self.upload_file("/tmp/mysql-boost-5.7.39.tar.gz", "/tmp/mysql-boost-5.7.39.tar.gz") # self.upload_file("/tmp/mysql-boost-5.7.39.tar.gz",
# "/tmp/mysql-boost-5.7.39.tar.gz")
# self.sync_other() # self.sync_other()
self.sync_site() self.sync_site()