diff --git a/plugins/apache/index.html b/plugins/apache/index.html index 153330175..62a7d71df 100755 --- a/plugins/apache/index.html +++ b/plugins/apache/index.html @@ -2,7 +2,7 @@
-

服务

+

服务

自启动

配置修改

负载状态

@@ -18,7 +18,7 @@
\ No newline at end of file diff --git a/plugins/apache/index.py b/plugins/apache/index.py index c010fba3d..7493175c8 100755 --- a/plugins/apache/index.py +++ b/plugins/apache/index.py @@ -213,8 +213,9 @@ def initDreplace(): def status(): - pid_file = getPidFile() - if not os.path.exists(pid_file): + cmd = "ps -ef|grep 'httpd/bin/httpd' |grep -v grep | grep -v python | awk '{print $2}'" + data = mw.execShell(cmd) + if data[0] == '': return 'stop' return 'start' diff --git a/plugins/apache/install.sh b/plugins/apache/install.sh index 461e93fe0..8df0bfec6 100755 --- a/plugins/apache/install.sh +++ b/plugins/apache/install.sh @@ -13,6 +13,7 @@ export PATH # apt install ncat -y # nc -u -v www.xx.com 443 +# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/apache && python3 plugins/apache/index.py start # cd /www/server/mdserver-web && python3 plugins/apache/index.py start # cd /www/server/mdserver-web && python3 plugins/apache/index.py run_info diff --git a/plugins/apache/js/httpd.js b/plugins/apache/js/httpd.js index 08fda3b5e..a6dbefba8 100755 --- a/plugins/apache/js/httpd.js +++ b/plugins/apache/js/httpd.js @@ -13,7 +13,7 @@ function httpPost(method, args, callback){ },'json'); } -function orPluginService(_name, version){ +function httpPluginService(_name, version){ var data = {name:_name, func:'status'} if ( typeof(version) != 'undefined' ){ data['version'] = version;