From d1da238ddc8e0eee6828f1905ffe31b0265e7ee1 Mon Sep 17 00:00:00 2001 From: dami Date: Sat, 17 Oct 2026 14:07:59 +0800 Subject: [PATCH] update --- .../rapira/conf/enable-rapira-upstream.conf | 3 -- plugins/rapira/conf/enable-rapira.conf | 10 ---- plugins/rapira/conf/pathinfo.conf | 11 ---- plugins/rapira/conf/phpinfo.conf | 4 -- plugins/rapira/conf/rapira_status.conf | 5 -- plugins/rapira/index.py | 50 ------------------- 6 files changed, 83 deletions(-) delete mode 100644 plugins/rapira/conf/enable-rapira-upstream.conf delete mode 100644 plugins/rapira/conf/enable-rapira.conf delete mode 100644 plugins/rapira/conf/pathinfo.conf delete mode 100644 plugins/rapira/conf/phpinfo.conf delete mode 100644 plugins/rapira/conf/rapira_status.conf diff --git a/plugins/rapira/conf/enable-rapira-upstream.conf b/plugins/rapira/conf/enable-rapira-upstream.conf deleted file mode 100644 index 9ac506ae9..000000000 --- a/plugins/rapira/conf/enable-rapira-upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream MW-UPSTREAM-RAPIRA{$PHP_VERSION} { - server unix:/tmp/rapira-cgi-{$PHP_VERSION}.sock; -} \ No newline at end of file diff --git a/plugins/rapira/conf/enable-rapira.conf b/plugins/rapira/conf/enable-rapira.conf deleted file mode 100644 index 0e5ed65ce..000000000 --- a/plugins/rapira/conf/enable-rapira.conf +++ /dev/null @@ -1,10 +0,0 @@ -set $PHP_ENV 1; -location ~ [^/]\.php(/|$) -{ - try_files $uri =404; - #fastcgi_pass unix:/tmp/rapira-cgi-{$PHP_VERSION}.sock; - fastcgi_pass MW-UPSTREAM-RAPIRA{$PHP_VERSION}; - fastcgi_index index.php; - include fastcgi.conf; - include {$SERVER_PATH}/web_conf/php/pathinfo.conf; -} \ No newline at end of file diff --git a/plugins/rapira/conf/pathinfo.conf b/plugins/rapira/conf/pathinfo.conf deleted file mode 100644 index fc5ad5219..000000000 --- a/plugins/rapira/conf/pathinfo.conf +++ /dev/null @@ -1,11 +0,0 @@ -set $real_script_name $fastcgi_script_name; -if ($fastcgi_script_name ~ "^(.+?\.php)(/.+)$") { - set $real_script_name $1; - set $path_info $2; - } -fastcgi_param SCRIPT_FILENAME $document_root$real_script_name; -fastcgi_param SCRIPT_NAME $real_script_name; -fastcgi_param PATH_INFO $path_info; - -#修复http3不传HOST问题 -fastcgi_param HTTP_HOST $host; \ No newline at end of file diff --git a/plugins/rapira/conf/phpinfo.conf b/plugins/rapira/conf/phpinfo.conf deleted file mode 100644 index 309ba3570..000000000 --- a/plugins/rapira/conf/phpinfo.conf +++ /dev/null @@ -1,4 +0,0 @@ -location /{$PHP_VERSION} { - root {$ROOT_PATH}/phpinfo; - include {$SERVER_PATH}/web_conf/php/conf/enable-php-rapira{$PHP_VERSION}.conf; -} \ No newline at end of file diff --git a/plugins/rapira/conf/rapira_status.conf b/plugins/rapira/conf/rapira_status.conf deleted file mode 100644 index cfc6090ba..000000000 --- a/plugins/rapira/conf/rapira_status.conf +++ /dev/null @@ -1,5 +0,0 @@ -location /rapira_status_{$PHP_VERSION} { - fastcgi_pass unix:/tmp/rapira-cgi-{$PHP_VERSION}.sock; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME \$fastcgi_script_name; -} \ No newline at end of file diff --git a/plugins/rapira/index.py b/plugins/rapira/index.py index 7bf014248..ab167bd28 100755 --- a/plugins/rapira/index.py +++ b/plugins/rapira/index.py @@ -159,55 +159,6 @@ def contentReplace(content, version): return content -def makeOpenrestyConf(): - phpversions = ['84','85'] - - sdir = mw.getServerDir() - - dst_dir = sdir + '/web_conf/php' - if not os.path.exists(dst_dir): - mw.execShell('mkdir -p ' + dst_dir) - - dst_dir_conf = sdir + '/web_conf/php/conf' - if not os.path.exists(dst_dir_conf): - mw.execShell('mkdir -p ' + dst_dir_conf) - - dst_dir_upstream = sdir + '/web_conf/php/upstream' - if not os.path.exists(dst_dir_upstream): - mw.execShell('mkdir -p ' + dst_dir_upstream) - - dst_pathinfo = sdir + '/web_conf/php/pathinfo.conf' - if not os.path.exists(dst_pathinfo): - src_pathinfo = getPluginDir() + '/conf/pathinfo.conf' - shutil.copyfile(src_pathinfo, dst_pathinfo) - - info = getPluginDir() + '/info.json' - content = mw.readFile(info) - content = json.loads(content) - versions = content['versions'] - tpl = getPluginDir() + '/conf/enable-rapira.conf' - tpl_content = mw.readFile(tpl) - for x in phpversions: - dfile = sdir + '/web_conf/php/conf/enable-php-rapira' + x + '.conf' - if not os.path.exists(dfile): - if x == '00': - mw.writeFile(dfile, '') - else: - content = contentReplace(tpl_content, x) - mw.writeFile(dfile, content) - - upstream_tpl = getPluginDir() + '/conf/enable-rapira-upstream.conf' - upstream_tpl_content = mw.readFile(upstream_tpl) - for x in phpversions: - dfile = sdir + '/web_conf/php/upstream/enable-php-rapira' + x + '.conf' - if not os.path.exists(dfile): - if x == '00': - mw.writeFile(dfile, '') - else: - content = contentReplace(upstream_tpl_content, x) - mw.writeFile(dfile, content) - - def phpPrependFile(version): app_start = getServerDir() + '/app_start.php' if not os.path.exists(app_start): @@ -238,7 +189,6 @@ def commonReplace(content,version): return content def initReplace(version): - makeOpenrestyConf() initD_path = getServerDir() + '/init.d' # if not os.path.exists(initD_path): # os.mkdir(initD_path)