diff --git a/.gitignore b/.gitignore index b9aeae68f..4424592da 100644 --- a/.gitignore +++ b/.gitignore @@ -107,7 +107,6 @@ venv.bak/ tmp/* *.swp *.zip -scripts/init.d/mw logs/* data/*.db data/control.conf @@ -132,7 +131,9 @@ include share pip-selfcheck.json +scripts/init.d/mw scripts/mdserver-web + data/api_login.txt data/sessions data/ssl.pl diff --git a/plugins/openresty/index.py b/plugins/openresty/index.py index 52cc2ac4e..a44534cef 100755 --- a/plugins/openresty/index.py +++ b/plugins/openresty/index.py @@ -300,7 +300,7 @@ def runInfo(): # 取Openresty负载状态 try: url = 'http://127.0.0.1/nginx_status' - result = mw.httpGet(url) + result = mw.httpGet(url, timeout=1) tmp = result.split() data = {} data['active'] = tmp[2] diff --git a/rewrite/nginx/phpwind.conf b/rewrite/nginx/phpwind.conf index 388af90d3..6dba1e34e 100755 --- a/rewrite/nginx/phpwind.conf +++ b/rewrite/nginx/phpwind.conf @@ -1,4 +1,4 @@ location / { - rewrite ^(.*)-htm-(.*)$ $1.php?$2 last; - rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last; - } \ No newline at end of file + rewrite ^(.*)-htm-(.*)$ $1.php?$2 last; + rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last; +} \ No newline at end of file