update
This commit is contained in:
parent
00c0c592fc
commit
d7fe140ff2
|
|
@ -131,7 +131,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/redis')
|
||||
content = content.replace('{$REDIS_PASS}', mw.getRandomString(10))
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ def dockerRemoveImage():
|
|||
|
||||
|
||||
def getImageListFunc(dbname=''):
|
||||
bkDir = mw.getRootDir() + '/backup/docker'
|
||||
bkDir = mw.getFatherDir() + '/backup/docker'
|
||||
blist = os.listdir(bkDir)
|
||||
r = []
|
||||
|
||||
|
|
@ -452,13 +452,13 @@ def getImageListFunc(dbname=''):
|
|||
|
||||
|
||||
def dockerImagePickDir():
|
||||
bkDir = mw.getRootDir() + '/backup/docker'
|
||||
bkDir = mw.getFatherDir() + '/backup/docker'
|
||||
return mw.returnJson(True, 'ok', bkDir)
|
||||
|
||||
|
||||
def dockerImagePickList():
|
||||
|
||||
bkDir = mw.getRootDir() + '/backup/docker'
|
||||
bkDir = mw.getFatherDir() + '/backup/docker'
|
||||
if not os.path.exists(bkDir):
|
||||
os.mkdir(bkDir)
|
||||
|
||||
|
|
@ -490,7 +490,7 @@ def dockerImagePickSave():
|
|||
if not data[0]:
|
||||
return data[1]
|
||||
|
||||
bkDir = mw.getRootDir() + '/backup/docker/'
|
||||
bkDir = mw.getFatherDir() + '/backup/docker/'
|
||||
images = args['images']
|
||||
try:
|
||||
file_name = bkDir + \
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
return content
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ export HOME=%s && ''' % ( getRunUser(), getHomeDir())
|
|||
def contentReplace(content):
|
||||
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$RUN_USER}', getRunUser())
|
||||
content = content.replace('{$HOME_DIR}', getHomeDir())
|
||||
|
|
@ -686,7 +686,7 @@ def projectScriptLoad():
|
|||
commit_tpl = getPluginDir() + '/hook/commit.tpl'
|
||||
commit = path + '/custom_hooks/commit'
|
||||
|
||||
codeDir = mw.getRootDir() + '/git'
|
||||
codeDir = mw.getFatherDir() + '/git'
|
||||
|
||||
cc_content = mw.readFile(commit_tpl)
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ export HOME=%s && ''' % ( getRunUser(), getHomeDir())
|
|||
def contentReplace(content):
|
||||
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$RUN_USER}', getRunUser())
|
||||
content = content.replace('{$HOME_DIR}', getHomeDir())
|
||||
|
|
@ -688,7 +688,7 @@ def projectScriptLoad():
|
|||
commit_tpl = getPluginDir() + '/hook/commit.tpl'
|
||||
commit = path + '/custom_hooks/commit'
|
||||
|
||||
codeDir = mw.getRootDir() + '/git'
|
||||
codeDir = mw.getFatherDir() + '/git'
|
||||
|
||||
cc_content = mw.readFile(commit_tpl)
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ def initRedisConf():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$CONFIG_ADMIN}', mw.getRandomString(6))
|
||||
content = content.replace('{$CONFIG_PASS}', mw.getRandomString(10))
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ def readConfigTpl():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$HA_USER}', mw.getRandomString(8))
|
||||
content = content.replace('{$HA_PWD}', mw.getRandomString(10))
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class App:
|
|||
def contentReplace(self, content):
|
||||
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$RUN_USER}', self.getRunUser())
|
||||
content = content.replace('{$HOME_DIR}', self.getHomeDir())
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ def getInitdTpl(version=''):
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP_PATH}', service_path + '/mariadb')
|
||||
server_id = int(time.time())
|
||||
|
|
@ -890,7 +890,7 @@ def importDbExternalProgressBar():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/import/'
|
||||
import_dir = mw.getFatherDir() + '/backup/import/'
|
||||
|
||||
file_path = import_dir + file
|
||||
if not os.path.exists(file_path):
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class backupTools:
|
|||
"----------------------------------------------------------------------------")
|
||||
return
|
||||
|
||||
backup_path = mw.getRootDir() + '/backup/database/mariadb'
|
||||
backup_path = mw.getFatherDir() + '/backup/database/mariadb'
|
||||
if not os.path.exists(backup_path):
|
||||
mw.execShell("mkdir -p " + backup_path)
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ class backupTools:
|
|||
|
||||
my_conf_path = db_path + '/etc/my.cnf'
|
||||
content = mw.readFile(my_conf_path)
|
||||
rep = "\[mysqldump\]\nuser=root"
|
||||
rep = r"\[mysqldump\]\nuser=root"
|
||||
sea = "[mysqldump]\n"
|
||||
subStr = sea + "user=root\npassword=" + mysql_root + "\n"
|
||||
content = content.replace(sea, subStr)
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ class classApi:
|
|||
# 创建目录
|
||||
self.send('/files/create_dir', {"path": dpath})
|
||||
|
||||
backup_path = mw.getRootDir() + '/backup'
|
||||
backup_path = mw.getFatherDir() + '/backup'
|
||||
if not os.path.exists(backup_path):
|
||||
os.makedirs(backup_path, 384)
|
||||
|
||||
|
|
@ -701,7 +701,7 @@ class classApi:
|
|||
root = self.getDbConn('mysql', 'config').where(
|
||||
'id=?', (1,)).getField('mysql_root')
|
||||
|
||||
backup_path = mw.getRootDir() + '/backup'
|
||||
backup_path = mw.getFatherDir() + '/backup'
|
||||
if not os.path.exists(backup_path):
|
||||
os.makedirs(backup_path, 384)
|
||||
|
||||
|
|
|
|||
|
|
@ -1204,7 +1204,7 @@ def replClose():
|
|||
return mw.returnJson(True, '关闭副本同步成功!')
|
||||
|
||||
def getDbBackupListFunc(dbname=''):
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getBackupDir() + '/database'
|
||||
blist = os.listdir(bkDir)
|
||||
r = []
|
||||
|
||||
|
|
@ -1223,7 +1223,7 @@ def getDbBackupList():
|
|||
return data[1]
|
||||
|
||||
r = getDbBackupListFunc(args['name'])
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getBackupDir() + '/database'
|
||||
rr = []
|
||||
for x in range(0, len(r)):
|
||||
p = bkDir + '/' + r[x]
|
||||
|
|
@ -1245,7 +1245,7 @@ def getDbBackupList():
|
|||
|
||||
def getDbBackupImportList():
|
||||
|
||||
bkImportDir = mw.getRootDir() + '/backup/mongodb_import'
|
||||
bkImportDir = mw.getBackupDir() + '/mongodb_import'
|
||||
if not os.path.exists(bkImportDir):
|
||||
os.mkdir(bkImportDir)
|
||||
|
||||
|
|
@ -1283,7 +1283,7 @@ def deleteDbBackup():
|
|||
|
||||
path = args['path']
|
||||
full_file = ""
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getBackupDir() + '/database'
|
||||
full_file = bkDir + '/' + args['filename']
|
||||
if path != "":
|
||||
full_file = path + "/" + args['filename']
|
||||
|
|
@ -1303,7 +1303,7 @@ def setDbBackup():
|
|||
|
||||
|
||||
def getListBson(dbname=''):
|
||||
bkDir = mw.getRootDir() + '/backup/mongodb_import/'+dbname
|
||||
bkDir = mw.getBackupDir() + '/mongodb_import/'+dbname
|
||||
blist = os.listdir(bkDir)
|
||||
r = []
|
||||
|
||||
|
|
@ -1327,7 +1327,7 @@ def importDbExternal():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/mongodb_import/'
|
||||
import_dir = mw.getBackupDir() + '/mongodb_import/'
|
||||
mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
|
||||
port = getConfPort()
|
||||
|
||||
|
|
@ -1535,8 +1535,7 @@ def installPreInspection(version):
|
|||
if sys[1] != '':
|
||||
return '暂时不支持该系统'
|
||||
|
||||
sys_id = mw.execShell(
|
||||
"cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
|
||||
sys_id = mw.execShell("cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
|
||||
|
||||
sysName = sys[0].strip().lower()
|
||||
sysId = sys_id[0].strip()
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ def mongdbClient():
|
|||
class backupTools:
|
||||
|
||||
def getDbBackupList(self,dbname=''):
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getFatherDir() + '/backup/database'
|
||||
blist = os.listdir(bkDir)
|
||||
r = []
|
||||
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ def getAuthPolicy():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP_PATH}',
|
||||
service_path + '/' + getPluginName())
|
||||
|
|
@ -932,7 +932,7 @@ def importDbExternalProgressBar():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/import/'
|
||||
import_dir = mw.getFatherDir() + '/backup/import/'
|
||||
|
||||
file_path = import_dir + file
|
||||
if not os.path.exists(file_path):
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class backupTools:
|
|||
"----------------------------------------------------------------------------")
|
||||
return
|
||||
|
||||
backup_path = mw.getRootDir() + '/backup/database/mysql-apt'
|
||||
backup_path = mw.getFatherDir() + '/backup/database/mysql-apt'
|
||||
if not os.path.exists(backup_path):
|
||||
mw.execShell("mkdir -p " + backup_path)
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ class backupTools:
|
|||
|
||||
my_conf_path = db_path + '/etc/my.cnf'
|
||||
mycnf = mw.readFile(my_conf_path)
|
||||
rep = "\[mysqldump\]\nuser=root"
|
||||
rep = r"\[mysqldump\]\nuser=root"
|
||||
sea = "[mysqldump]\n"
|
||||
subStr = sea + "user=root\npassword=" + mysql_root + "\n"
|
||||
mycnf = mycnf.replace(sea, subStr)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ def getAuthPolicy():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP_PATH}',service_path + '/' + getPluginName())
|
||||
|
||||
|
|
@ -930,7 +930,7 @@ def importDbExternalProgressBar():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/import/'
|
||||
import_dir = mw.getFatherDir() + '/backup/import/'
|
||||
|
||||
file_path = import_dir + file
|
||||
if not os.path.exists(file_path):
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class backupTools:
|
|||
"----------------------------------------------------------------------------")
|
||||
return
|
||||
|
||||
backup_path = mw.getRootDir() + '/backup/database/mysql-yum'
|
||||
backup_path = mw.getFatherDir() + '/backup/database/mysql-yum'
|
||||
if not os.path.exists(backup_path):
|
||||
mw.execShell("mkdir -p " + backup_path)
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ class backupTools:
|
|||
|
||||
mw.backFile(my_cnf)
|
||||
content = mw.readFile(my_cnf)
|
||||
rep = "\[mysqldump\]\nuser=root"
|
||||
rep = r"\[mysqldump\]\nuser=root"
|
||||
sea = "[mysqldump]\n"
|
||||
subStr = sea + "user=root\npassword=" + mysql_root + "\n"
|
||||
content = content.replace(sea, subStr)
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ def getInitdTpl(version=''):
|
|||
def contentReplace(content):
|
||||
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP_PATH}', service_path + '/mysql')
|
||||
|
||||
|
|
@ -1011,7 +1011,7 @@ def importDbExternal():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/import/'
|
||||
import_dir = mw.getFatherDir() + '/backup/import/'
|
||||
|
||||
file_path = import_dir + file
|
||||
if not os.path.exists(file_path):
|
||||
|
|
@ -1096,7 +1096,7 @@ def importDbExternalProgressBar():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
import_dir = mw.getRootDir() + '/backup/import/'
|
||||
import_dir = mw.getFatherDir() + '/backup/import/'
|
||||
|
||||
file_path = import_dir + file
|
||||
if not os.path.exists(file_path):
|
||||
|
|
@ -1159,11 +1159,11 @@ def importDbBackup():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
file_path = mw.getRootDir() + '/backup/database/' + file
|
||||
file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
|
||||
file_path = mw.getFatherDir() + '/backup/database/' + file
|
||||
file_path_sql = mw.getFatherDir() + '/backup/database/' + file.replace('.gz', '')
|
||||
|
||||
if not os.path.exists(file_path_sql):
|
||||
cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
|
||||
cmd = 'cd ' + mw.getFatherDir() + '/backup/database && gzip -d ' + file
|
||||
mw.execShell(cmd)
|
||||
|
||||
local_mode = recognizeDbMode()
|
||||
|
|
@ -1210,11 +1210,11 @@ def importDbBackupProgressBar():
|
|||
file = args['file']
|
||||
name = args['name']
|
||||
|
||||
file_path = mw.getRootDir() + '/backup/database/' + file
|
||||
file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
|
||||
file_path = mw.getFatherDir() + '/backup/database/' + file
|
||||
file_path_sql = mw.getFatherDir() + '/backup/database/' + file.replace('.gz', '')
|
||||
|
||||
if not os.path.exists(file_path_sql):
|
||||
cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
|
||||
cmd = 'cd ' + mw.getFatherDir() + '/backup/database && gzip -d ' + file
|
||||
mw.execShell(cmd)
|
||||
|
||||
local_mode = recognizeDbMode()
|
||||
|
|
@ -1241,7 +1241,7 @@ def deleteDbBackup():
|
|||
|
||||
path = args['path']
|
||||
full_file = ""
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getFatherDir() + '/backup/database'
|
||||
full_file = bkDir + '/' + args['filename']
|
||||
if path != "":
|
||||
full_file = path + "/" + args['filename']
|
||||
|
|
@ -1256,7 +1256,7 @@ def getDbBackupList():
|
|||
return data[1]
|
||||
|
||||
r = getDbBackupListFunc(args['name'])
|
||||
bkDir = mw.getRootDir() + '/backup/database'
|
||||
bkDir = mw.getFatherDir() + '/backup/database'
|
||||
rr = []
|
||||
for x in range(0, len(r)):
|
||||
p = bkDir + '/' + r[x]
|
||||
|
|
@ -1279,7 +1279,7 @@ def getDbBackupList():
|
|||
|
||||
def getDbBackupImportList():
|
||||
|
||||
bkImportDir = mw.getRootDir() + '/backup/import'
|
||||
bkImportDir = mw.getFatherDir() + '/backup/import'
|
||||
if not os.path.exists(bkImportDir):
|
||||
os.mkdir(bkImportDir)
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ class App:
|
|||
def contentReplace(self, content):
|
||||
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$RUN_USER}', self.getRunUser())
|
||||
content = content.replace('{$HOME_DIR}', self.getHomeDir())
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ def writeConf(data):
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$APP_PATH}', app_path)
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ def contentReplace(content):
|
|||
service_path = mw.getServerDir()
|
||||
waf_root = getServerDir()
|
||||
waf_path = waf_root + "/waf"
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$WAF_PATH}', waf_path)
|
||||
content = content.replace('{$WAF_ROOT}', waf_root)
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ def contentReplace(content):
|
|||
cfg = getCfg()
|
||||
service_path = mw.getServerDir()
|
||||
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$APP_PATH}', service_path+'/'+getPluginName()+'/data')
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ def status(version):
|
|||
|
||||
def contentReplace(content, version):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_VERSION}', version)
|
||||
content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
|
||||
|
|
@ -739,7 +739,7 @@ def getPhpinfo(version):
|
|||
return 'PHP[' + version + ']未启动,不可访问!!!'
|
||||
|
||||
sock_file = getFpmAddress(version)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ def getPhpinfo(version):
|
|||
|
||||
sock_file = getFpmAddress(version)
|
||||
# print(sock_file)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ def status(version):
|
|||
|
||||
def contentReplace(content, version):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_VERSION}', version)
|
||||
content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
|
||||
|
|
@ -88,15 +88,15 @@ def contentReplace(content, version):
|
|||
content = content.replace('{$PHP_USER}', 'nobody')
|
||||
content = content.replace('{$PHP_GROUP}', 'nobody')
|
||||
|
||||
rep = 'listen.owner\s*=\s*(.+)\r?\n'
|
||||
rep = r'listen.owner\s*=\s*(.+)\r?\n'
|
||||
val = ';listen.owner = nobody\n'
|
||||
content = re.sub(rep, val, content)
|
||||
|
||||
rep = 'listen.group\s*=\s*(.+)\r?\n'
|
||||
rep = r'listen.group\s*=\s*(.+)\r?\n'
|
||||
val = ';listen.group = nobody\n'
|
||||
content = re.sub(rep, val, content)
|
||||
|
||||
rep = 'user\s*=\s*(.+)\r?\n'
|
||||
rep = r'user\s*=\s*(.+)\r?\n'
|
||||
val = ';user = nobody\n'
|
||||
content = re.sub(rep, val, content)
|
||||
|
||||
|
|
@ -742,7 +742,7 @@ def getPhpinfo(version):
|
|||
return 'PHP[' + version + ']未启动,不可访问!!!'
|
||||
|
||||
sock_file = getFpmAddress(version)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ def getPhpinfo(version):
|
|||
return 'PHP[' + version + ']未启动,不可访问!!!'
|
||||
|
||||
sock_file = getFpmAddress(version)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ def status(version):
|
|||
|
||||
def contentReplace(content, version):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_VERSION}', version)
|
||||
content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
|
||||
|
|
@ -913,7 +913,7 @@ def getPhpinfo(version):
|
|||
return 'PHP[' + version + ']未启动,不可访问!!!'
|
||||
|
||||
sock_file = getFpmAddress(version)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ def getPhpinfo(version):
|
|||
return 'PHP[' + version + ']未启动,不可访问!!!'
|
||||
|
||||
sock_file = getFpmAddress(version)
|
||||
root_dir = mw.getRootDir() + '/phpinfo'
|
||||
root_dir = mw.getFatherDir() + '/phpinfo'
|
||||
|
||||
mw.execShell("rm -rf " + root_dir)
|
||||
mw.execShell("mkdir -p " + root_dir)
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ def contentReplace(content):
|
|||
blowfish_secret = tmp[0].strip()
|
||||
# print php_ver
|
||||
php_conf_dir = mw.getServerDir() + '/web_conf/php/conf'
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_CONF_PATH}', php_conf_dir)
|
||||
content = content.replace('{$PHP_VER}', php_ver)
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ def getInitdTpl(version=''):
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$APP_PATH}', service_path + '/postgresql')
|
||||
return content
|
||||
|
|
@ -721,8 +721,7 @@ def importDbBackup():
|
|||
|
||||
pwd = pSqliteDb('config').where('id=?', (1,)).getField('pg_root')
|
||||
|
||||
mysql_cmd = mw.getRootDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + \
|
||||
' ' + name + ' < ' + file_path_sql
|
||||
mysql_cmd = mw.getFatherDir() + '/server/mysql/bin/mysql -uroot -p' + pwd + ' ' + name + ' < ' + file_path_sql
|
||||
|
||||
# print(mysql_cmd)
|
||||
os.system(mysql_cmd)
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
return content
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
|
||||
content = content.replace('{$REDIS_PASS}', mw.getRandomString(10))
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/simpleping')
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ def readConfigTpl():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/sphinx')
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ def checkArgs(data, ck=[]):
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/sys-opt')
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ def getInitDTpl():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$SERVER_APP}', service_path + '/varnish')
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ def contentReplace(content):
|
|||
service_path = mw.getServerDir()
|
||||
php_ver = getCachePhpVer()
|
||||
# print php_ver
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_VER}', php_ver)
|
||||
return content
|
||||
|
|
@ -106,7 +106,7 @@ def contentReplace(content):
|
|||
def contentReplacePHP(content, version):
|
||||
service_path = mw.getServerDir()
|
||||
# print php_ver
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$PHP_VER}', version)
|
||||
return content
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ def getInstallVerion():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
content = content.replace('{$ZABBIX_ROOT}', '/usr/share/zabbix')
|
||||
content = content.replace('{$ZABBIX_PORT}', '18888')
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ def status():
|
|||
|
||||
def contentReplace(content):
|
||||
service_path = mw.getServerDir()
|
||||
content = content.replace('{$ROOT_PATH}', mw.getRootDir())
|
||||
content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
|
||||
content = content.replace('{$SERVER_PATH}', service_path)
|
||||
return content
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue