up

plugins/apache/conf/httpd.conf

@@ -1,109 +0,0 @@
-user  {$OS_USER} {$OS_USER_GROUP};
-worker_processes auto;
-worker_cpu_affinity auto;
-error_log  {$SERVER_PATH}/openresty/nginx/logs/error.log  crit;
-pid        {$SERVER_PATH}/openresty/nginx/logs/nginx.pid;
-
-worker_rlimit_nofile 65535;
-pcre_jit on;
-
-events
-{
-    use {$EVENT_MODEL};
-    worker_connections 51200;
-    multi_accept on;
-
-    # file/video close the mutex lock when under high load
-    # accept_mutex off;
-}
-
-http
-{
-    include  mime.types;
-    
-	include {$SERVER_PATH}/web_conf/nginx/lua/lua.conf;
-	#include proxy.conf;
-
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for" "$request_time"';
-
-    server_names_hash_bucket_size 32;
-    client_header_buffer_size 32k;
-    large_client_header_buffers 4 32k;
-    client_body_buffer_size 128k;
-    client_max_body_size 20m;
-
-    # video big file opt
-    aio threads;
-    directio 4m;
-    output_buffers 16 512k;
-    sendfile   on;
-    tcp_nopush on;
-    tcp_nodelay on;
-
-    keepalive_timeout 60;
-
-    fastcgi_connect_timeout 60;
-    fastcgi_send_timeout 60;
-    fastcgi_read_timeout 60;
-    fastcgi_buffer_size 64k;
-    fastcgi_buffers 4 64k;
-    fastcgi_busy_buffers_size 128k;
-    fastcgi_temp_file_write_size 256k;
-	fastcgi_intercept_errors on;
-
-    zstd off;
-    zstd_comp_level 6;
-    zstd_min_length 256;
-    zstd_types text/plain text/css text/xml text/javascript text/cache-manifest text/x-component text/vtt application/javascript application/json application/ld+json application/xml application/xhtml+xml application/rss+xml application/atom+xml application/manifest+json application/x-web-app-manifest+json application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/wasm font/opentype image/svg+xml image/bmp;
-
-    brotli off;
-    brotli_min_length 256;
-    brotli_buffers 32 8k;
-    brotli_comp_level 4;
-    brotli_window 16m;
-    brotli_static on;
-    brotli_types text/plain text/css text/xml text/javascript text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml application/atom+xml application/vnd.ms-fontobject application/x-font-ttf application/x-font-opentype application/x-font-truetype font/tpl font/opentype font/otf font/ttf image/svg+xml image/x-icon image/vnd.microsoft.icon application/wasm application/manifest+json;
-
-    gzip on;
-    gzip_min_length  1k;
-    gzip_buffers     4 16k;
-    gzip_http_version 1.1;
-    gzip_comp_level 9;
-    gzip_types     text/plain application/javascript application/x-javascript text/javascript text/css application/xml;
-    gzip_vary on;
-    gzip_proxied   expired no-cache no-store private auth;
-    gzip_disable   "MSIE [1-6]\.";
-
-
-    limit_conn_zone $binary_remote_addr zone=perip:10m;
-	limit_conn_zone $server_name zone=perserver:10m;
-
-    # CACEH_BEGIN
-    proxy_buffering on;
-    proxy_buffer_size 1024k;
-    proxy_buffers 16 1024k;
-    proxy_busy_buffers_size 2048k;
-    proxy_temp_file_write_size 2048k;
-    proxy_cache_path {$SERVER_PATH}/openresty/nginx/proxy_cache_temp levels=1:2 keys_zone=mw_cache:512m inactive=5m max_size=2g use_temp_path=off;
-    #proxy timeout
-    proxy_connect_timeout 3s;
-    proxy_read_timeout 5s;
-    proxy_send_timeout 5s;
-
-    fastcgi_cache_key "$scheme$request_method$host$request_uri";
-    fastcgi_cache_path {$SERVER_PATH}/openresty/nginx/fastcgi_cache_temp levels=1:2 keys_zone=mw_cache_fcgi:100m inactive=60m max_size=5g;
-    fastcgi_cache_use_stale error timeout invalid_header http_500;
-    fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
-    # CACEH_END
-
-    server_tokens off;
-    access_log /dev/null;
-    more_set_headers "Server: mdserver-web";
-    
-    include {$SERVER_PATH}/web_conf/nginx/vhost/*.conf;
-}
-

plugins/apache/index.py

@@ -70,7 +70,7 @@ def checkArgs(data, ck=[]):
 
 
 def clearTemp():
-    path_bin = getServerDir() + "/nginx"
+    path_bin = getServerDir() + "/apache/httpd"
     mw.execShell('rm -rf ' + path_bin + '/client_body_temp')
     mw.execShell('rm -rf ' + path_bin + '/fastcgi_temp')
     mw.execShell('rm -rf ' + path_bin + '/proxy_temp')
@@ -79,33 +79,24 @@ def clearTemp():
 
 
 def getConf():
-    path = getServerDir() + "/nginx/conf/nginx.conf"
+    path = getServerDir() + "/httpd/conf/httpd.conf"
     return path
 
 
 def getConfTpl():
-    path = getPluginDir() + '/conf/nginx.conf'
+    path = getPluginDir() + '/conf/httpd.conf'
     return path
 
 
 def getOs():
     data = {}
     data['os'] = mw.getOs()
-    ng_exe_bin = getServerDir() + "/nginx/sbin/nginx"
+    data['auth'] = True
-
-    # if mw.isAppleSystem():
-    #     data['auth'] = True
-    #     return mw.getJson(data)
-
-    if checkAuthEq(ng_exe_bin, 'root'):
-        data['auth'] = True
-    else:
-        data['auth'] = False
     return mw.getJson(data)
 
 
 def getInitDTpl():
-    path = getPluginDir() + "/init.d/nginx.tpl"
+    path = getPluginDir() + "/init.d/httpd.tpl"
     return path
 
 
@@ -207,28 +198,6 @@ def initDreplace():
         # config replace
         confReplace()
 
-    # give nginx root permission
-    # ng_exe_bin = getServerDir() + "/nginx/sbin/nginx"
-    # if not checkAuthEq(ng_exe_bin, 'root'):
-    #     user = 'www'
-    #     user_group = 'www'
-    #     current_os = mw.getOs()
-    #     if current_os == 'darwin':
-    #         user = 'root'
-    #         user_group = 'staff'
-    #     args = getArgs()
-    #     if not 'pwd' in args:
-    #         print("权限不足，需要认证启动!")
-    #         exit(0)
-
-        sudoPwd = args['pwd']
-        cmd_own = 'chown -R ' + user+':' + user_group + ' ' + ng_exe_bin
-        mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_own))
-        cmd_mod = 'chmod 755 ' + ng_exe_bin
-        mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_mod))
-        cmd_s = 'chmod u+s ' + ng_exe_bin
-        mw.execShell('echo %s|sudo -S %s' % (sudoPwd, cmd_s))
-
     # systemd
     # /usr/lib/systemd/system
     systemDir = mw.systemdCfgDir()

plugins/apache/versions/2.4/install.sh

@@ -70,9 +70,9 @@ Install_App()
 	if [ ! -d ${serverPath}/apache/apr ];then
 		cd ${apacheDir} && tar -jxf apr-${APR_VERSION}.tar.bz2
 		cd ${apacheDir}/apr-${APR_VERSION} && ./configure --prefix=${serverPath}/apache/apr
+		make -j${cpuCore} && make install
 		if [ "$?" == "0" ];then
-			make -j${cpuCore} && make install
+			if [ ! -f ${serverPath}/apache/apr/bin/apr-1-config ];then
-			if [ ! -f ${serverPath}/apache/apr/bin/apr-config ];then
 				echo "APR installation failed: apr-config not found"
 				exit 1
 			fi
@@ -86,8 +86,8 @@ Install_App()
 	if [ ! -d ${serverPath}/apache/apr-util ];then
 		cd ${apacheDir} && tar -jxf apr-util-${APR_UTIL_VERSION}.tar.bz2
 		cd ${apacheDir}/apr-util-${APR_UTIL_VERSION} && ./configure --prefix=${serverPath}/apache/apr-util --with-apr=${serverPath}/apache/apr
+		make -j${cpuCore} && make install
 		if [ "$?" == "0" ];then
-			make -j${cpuCore} && make install
 			if [ ! -f ${serverPath}/apache/apr-util/bin/apu-1-config ];then
 				echo "APR-util installation failed: apu-config not found"
 				find ${serverPath}/apache/apr-util -name "apu-config"