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

Merge branch 'dev' into feta_openresty

Browse Source
This commit is contained in:
soxft
2022-06-29 02:36:24 +00:00
parent 87c7492555 74034b246a
commit b02323fb84
53 changed files with 837 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/core/site_api.py
+7 -5
View File
@@ -89,9 +89,9 @@ class site_api:
name = request.form.get('name', '')
import time
# 清理旧的
defaultSite = mw.readFile('data/defaultSite.pl')
if defaultSite:
path = self.getHostConf(defaultSite)
default_site = mw.readFile('data/default_site.pl')
if default_site:
path = self.getHostConf(default_site)
if os.path.exists(path):
conf = mw.readFile(path)
rep = "listen\s+80.+;"
@@ -109,7 +109,7 @@ class site_api:
conf = re.sub(rep, 'listen 443 ssl default_server;', conf, 1)
mw.writeFile(path, conf)
mw.writeFile('data/defaultSite.pl', name)
mw.writeFile('data/default_site.pl', name)
mw.restartWeb()
return mw.returnJson(True, '设置成功!')
@@ -117,7 +117,7 @@ class site_api:
data = {}
data['sites'] = mw.M('sites').field(
'name').order('id desc').select()
data['defaultSite'] = mw.readFile('data/defaultSite.pl')
data['default_site'] = mw.readFile('data/default_site.pl')
return mw.getJson(data)
def setPsApi(self):
@@ -1729,6 +1729,7 @@ include enable-php-''' % (fix.strip().replace(',', '|'), domains.strip().replace
os.makedirs(path)
if not mw.isAppleSystem():
mw.execShell('chown -R www:www ' + path)
mw.writeFile(path + '/index.html', 'Work has started!!!')
mw.execShell('chmod -R 755 ' + path)
def nginxAddDomain(self, webname, domain, port):
@@ -1764,6 +1765,7 @@ include enable-php-''' % (fix.strip().replace(',', '|'), domains.strip().replace
content = content.replace('{$PORT}', self.sitePort)
content = content.replace('{$SERVER_NAME}', self.siteName)
content = content.replace('{$ROOT_DIR}', self.sitePath)
content = content.replace('{$PHP_DIR}', self.setupPath + '/php')
content = content.replace('{$PHPVER}', self.phpVersion)
content = content.replace('{$OR_REWRITE}', self.rewritePath)
content = content.replace('{$OR_REDIRECT}', self.redirectPath)