From 4ae5c21702ec304ace1f1d8af99f9d2098d7a5be Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 7 Jul 2022 15:20:57 +0800 Subject: [PATCH] up --- plugins/php-ya/lib/freetype_new.sh | 25 ------------ plugins/php-ya/lib/freetype_old.sh | 25 ------------ plugins/php-ya/lib/icu.sh | 29 ------------- plugins/php-ya/lib/libiconv.sh | 25 ------------ plugins/php-ya/lib/libmemcached.sh | 28 ------------- plugins/php-ya/lib/libzip.sh | 31 -------------- plugins/php-ya/lib/openssl.sh | 38 ------------------ plugins/php-ya/lib/openssl_10.sh | 27 ------------- plugins/php-ya/lib/zlib.sh | 31 -------------- plugins/{php-ya => php-yum}/all_test.sh | 0 .../{php-ya => php-yum}/conf/app_start.php | 0 .../{php-ya => php-yum}/conf/enable-php.conf | 0 .../{php-ya => php-yum}/conf/pathinfo.conf | 0 plugins/{php-ya => php-yum}/conf/php-fpm.conf | 0 plugins/{php-ya => php-yum}/conf/php7.ini | 0 plugins/{php-ya => php-yum}/conf/php8.ini | 0 .../conf/phpfpm_status.conf | 0 plugins/{php-ya => php-yum}/conf/phpinfo.conf | 0 plugins/{php-ya => php-yum}/conf/www.conf | 0 plugins/{php-ya => php-yum}/ico.png | Bin plugins/{php-ya => php-yum}/index.html | 17 ++++---- plugins/{php-ya => php-yum}/index.py | 5 +-- plugins/{php-ya => php-yum}/info.json | 10 ++--- .../init.d/php.service.tpl | 0 plugins/{php-ya => php-yum}/init.d/php.tpl | 0 plugins/{php-ya => php-yum}/init.d/php52.tpl | 0 plugins/{php-ya => php-yum}/install.sh | 15 ++----- plugins/{php-ya => php-yum}/js/php.js | 4 +- .../versions/71/install.sh | 0 .../versions/72/install.sh | 0 .../versions/73/install.sh | 0 .../versions/74/install.sh | 0 .../versions/80/install.sh | 0 .../versions/81/install.sh | 27 ++++--------- .../versions/common/exif.sh | 0 .../versions/common/fileinfo.sh | 0 .../{php-ya => php-yum}/versions/common/gd.sh | 0 .../versions/common/imagemagick.sh | 0 .../versions/common/intl.sh | 0 .../versions/common/mcrypt.sh | 0 .../versions/common/memcached.sh | 0 .../versions/common/mongodb.sh | 0 .../versions/common/opcache.sh | 0 .../versions/common/openssl.sh | 0 .../versions/common/pcntl.sh | 0 .../versions/common/redis.sh | 0 .../versions/common/seaslog.sh | 0 .../versions/common/solr.sh | 0 .../versions/common/swoole.sh | 0 .../versions/common/xdebug.sh | 0 .../versions/common/xhprof.sh | 0 .../versions/common/yac.sh | 0 .../versions/common/yaf.sh | 0 .../versions/common/yar.sh | 0 .../versions/common/zip.sh | 0 .../versions/common/zlib.sh | 0 plugins/{php-ya => php-yum}/versions/lib.sh | 0 .../{php-ya => php-yum}/versions/phplib.conf | 0 58 files changed, 26 insertions(+), 311 deletions(-) delete mode 100644 plugins/php-ya/lib/freetype_new.sh delete mode 100644 plugins/php-ya/lib/freetype_old.sh delete mode 100644 plugins/php-ya/lib/icu.sh delete mode 100644 plugins/php-ya/lib/libiconv.sh delete mode 100644 plugins/php-ya/lib/libmemcached.sh delete mode 100644 plugins/php-ya/lib/libzip.sh delete mode 100644 plugins/php-ya/lib/openssl.sh delete mode 100644 plugins/php-ya/lib/openssl_10.sh delete mode 100644 plugins/php-ya/lib/zlib.sh rename plugins/{php-ya => php-yum}/all_test.sh (100%) rename plugins/{php-ya => php-yum}/conf/app_start.php (100%) rename plugins/{php-ya => php-yum}/conf/enable-php.conf (100%) rename plugins/{php-ya => php-yum}/conf/pathinfo.conf (100%) rename plugins/{php-ya => php-yum}/conf/php-fpm.conf (100%) rename plugins/{php-ya => php-yum}/conf/php7.ini (100%) rename plugins/{php-ya => php-yum}/conf/php8.ini (100%) rename plugins/{php-ya => php-yum}/conf/phpfpm_status.conf (100%) rename plugins/{php-ya => php-yum}/conf/phpinfo.conf (100%) rename plugins/{php-ya => php-yum}/conf/www.conf (100%) rename plugins/{php-ya => php-yum}/ico.png (100%) rename plugins/{php-ya => php-yum}/index.html (52%) rename plugins/{php-ya => php-yum}/index.py (99%) rename plugins/{php-ya => php-yum}/info.json (59%) rename plugins/{php-ya => php-yum}/init.d/php.service.tpl (100%) rename plugins/{php-ya => php-yum}/init.d/php.tpl (100%) rename plugins/{php-ya => php-yum}/init.d/php52.tpl (100%) rename plugins/{php-ya => php-yum}/install.sh (60%) rename plugins/{php-ya => php-yum}/js/php.js (99%) rename plugins/{php-ya => php-yum}/versions/71/install.sh (100%) rename plugins/{php-ya => php-yum}/versions/72/install.sh (100%) rename plugins/{php-ya => php-yum}/versions/73/install.sh (100%) rename plugins/{php-ya => php-yum}/versions/74/install.sh (100%) rename plugins/{php-ya => php-yum}/versions/80/install.sh (100%) rename plugins/{php-ya => php-yum}/versions/81/install.sh (74%) rename plugins/{php-ya => php-yum}/versions/common/exif.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/fileinfo.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/gd.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/imagemagick.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/intl.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/mcrypt.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/memcached.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/mongodb.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/opcache.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/openssl.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/pcntl.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/redis.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/seaslog.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/solr.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/swoole.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/xdebug.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/xhprof.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/yac.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/yaf.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/yar.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/zip.sh (100%) rename plugins/{php-ya => php-yum}/versions/common/zlib.sh (100%) rename plugins/{php-ya => php-yum}/versions/lib.sh (100%) rename plugins/{php-ya => php-yum}/versions/phplib.conf (100%) diff --git a/plugins/php-ya/lib/freetype_new.sh b/plugins/php-ya/lib/freetype_new.sh deleted file mode 100644 index cc67f77c8..000000000 --- a/plugins/php-ya/lib/freetype_new.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/freetype ];then - cd $SOURCE_ROOT - wget -O freetype-2.12.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.gz -T 5 - tar zxvf freetype-2.12.1.tar.gz - cd freetype-2.12.1 - ./configure --prefix=${SERVER_ROOT}/freetype && make && make install - cd $SOURCE_ROOT - #rm -rf freetype-2.12.1.tar.gz - #rm -rf freetype-2.12.1 -fi \ No newline at end of file diff --git a/plugins/php-ya/lib/freetype_old.sh b/plugins/php-ya/lib/freetype_old.sh deleted file mode 100644 index 234c87a52..000000000 --- a/plugins/php-ya/lib/freetype_old.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/freetype_old ];then - cd $SOURCE_ROOT - wget -O freetype-2.7.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz -T 5 - tar zxvf freetype-2.7.1.tar.gz - cd freetype-2.7.1 - ./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install - #cd $SOURCE_ROOT - #rm -rf freetype-2.7.1.tar.gz - #rm -rf freetype-2.7.1 -fi \ No newline at end of file diff --git a/plugins/php-ya/lib/icu.sh b/plugins/php-ya/lib/icu.sh deleted file mode 100644 index f9d0c1a3f..000000000 --- a/plugins/php-ya/lib/icu.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/icu ];then - - if [ ! -f ${SOURCE_ROOT}/icu4c-52_2-src.tgz ];then - wget -O ${SOURCE_ROOT}/icu4c-52_2-src.tgz https://github.com/unicode-org/icu/releases/download/release-52-2/icu4c-52_2-src.tgz - fi - - if [ ! -d ${SERVER_ROOT}/icu/52.2 ];then - cd ${SOURCE_ROOT} && tar -zxvf icu4c-52_2-src.tgz - - cd ${SOURCE_ROOT}/icu/source - ./runConfigureICU Linux --prefix=${SERVER_ROOT}/icu && make CXXFLAGS="-g -O2 -std=c++11" && make install - fi - -fi \ No newline at end of file diff --git a/plugins/php-ya/lib/libiconv.sh b/plugins/php-ya/lib/libiconv.sh deleted file mode 100644 index c9f57fa88..000000000 --- a/plugins/php-ya/lib/libiconv.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/libiconv ];then - cd $SOURCE_ROOT - wget -O libiconv-1.15.tar.gz https://github.com/midoks/mdserver-web/releases/download/init/libiconv-1.15.tar.gz -T 5 - tar zxvf libiconv-1.15.tar.gz - cd libiconv-1.15 - ./configure --prefix=${SERVER_ROOT}/libiconv --enable-static && make && make install - cd $SOURCE_ROOT - #rm -rf libiconv-1.15 - #rm -rf libiconv-1.15.tar.gz -fi \ No newline at end of file diff --git a/plugins/php-ya/lib/libmemcached.sh b/plugins/php-ya/lib/libmemcached.sh deleted file mode 100644 index 76297d853..000000000 --- a/plugins/php-ya/lib/libmemcached.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -# cd /www/server/mdserver-web/plugins/php/lib && /bin/bash libmemcached.sh - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -#----------------------------- libmemcached start -------------------------# -if [ ! -d ${SERVER_ROOT}/libmemcached ];then - cd ${SOURCE_ROOT} - if [ ! -f ${SOURCE_ROOT}/libmemcached-1.0.4.tar.gz ];then - wget -O libmemcached-1.0.4.tar.gz https://launchpad.net/libmemcached/1.0/1.0.4/+download/libmemcached-1.0.4.tar.gz -T 20 - fi - tar -zxf libmemcached-1.0.4.tar.gz - cd libmemcached-1.0.4 - ./configure --prefix=${SERVER_ROOT}/libmemcached -with-memcached && make && make install -fi -#----------------------------- libmemcached end -------------------------# \ No newline at end of file diff --git a/plugins/php-ya/lib/libzip.sh b/plugins/php-ya/lib/libzip.sh deleted file mode 100644 index e296876ea..000000000 --- a/plugins/php-ya/lib/libzip.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/libzip ];then - - cd $SOURCE_ROOT - if [ ! -f ${SOURCE_ROOT}/libzip-1.3.2.tar.gz ];then - wget -O libzip-1.3.2.tar.gz --no-check-certificate https://nih.at/libzip/libzip-1.3.2.tar.gz -T 20 - fi - - tar -zxvf libzip-1.3.2.tar.gz - cd libzip-1.3.2 - - ./configure --prefix=${SERVER_ROOT}/libzip && make && make install - - #cd $SOURCE_ROOT - #rm -rf libzip-1.3.2 - #rm -rf libzip-1.3.2.tar.gz -fi \ No newline at end of file diff --git a/plugins/php-ya/lib/openssl.sh b/plugins/php-ya/lib/openssl.sh deleted file mode 100644 index 4d6294eac..000000000 --- a/plugins/php-ya/lib/openssl.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -# if [ ! -d ${SERVER_ROOT}/openssl ];then -# cd ${SOURCE_ROOT} -# if [ ! -f ${SOURCE_ROOT}/openssl-1.0.2q.tar.gz ];then -# wget https://github.com/midoks/mdserver-web/releases/download/init/openssl-1.0.2q.tar.gz -T 20 -# fi -# tar -zxf openssl-1.0.2q.tar.gz -# cd openssl-1.0.2q -# ./config --openssldir=${SERVER_ROOT}/openssl zlib-dynamic shared -# make && make install -# fi - - -if [ ! -d ${SERVER_ROOT}/openssl ];then - cd ${SOURCE_ROOT} - if [ ! -f ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz ];then - wget -O ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz https://www.openssl.org/source/openssl-1.1.1p.tar.gz - fi - tar -zxvf openssl-1.1.1p.tar.gz - cd openssl-1.1.1p - ./config --prefix=${SERVER_ROOT}/openssl zlib-dynamic shared - make && make install -fi - diff --git a/plugins/php-ya/lib/openssl_10.sh b/plugins/php-ya/lib/openssl_10.sh deleted file mode 100644 index 90c1155e3..000000000 --- a/plugins/php-ya/lib/openssl_10.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/openssl10 ];then - cd ${SOURCE_ROOT} - if [ ! -f ${SOURCE_ROOT}/openssl-1.0.2q.tar.gz ];then - wget https://github.com/midoks/mdserver-web/releases/download/init/openssl-1.0.2q.tar.gz -T 20 - fi - tar -zxf openssl-1.0.2q.tar.gz - cd openssl-1.0.2q - ./config --openssldir=${SERVER_ROOT}/openssl10 zlib-dynamic shared - make && make install -fi - - diff --git a/plugins/php-ya/lib/zlib.sh b/plugins/php-ya/lib/zlib.sh deleted file mode 100644 index ab6b4c50a..000000000 --- a/plugins/php-ya/lib/zlib.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export PATH - -curPath=`pwd` -rootPath=$(dirname "$curPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") -rootPath=$(dirname "$rootPath") - -# echo $rootPath - -SERVER_ROOT=$rootPath/lib -SOURCE_ROOT=$rootPath/source/lib - -if [ ! -d ${SERVER_ROOT}/zlib ];then - - cd $SOURCE_ROOT - if [ ! -f ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ];then - wget -O zlib-1.2.11.tar.gz --no-check-certificate https://github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20 - fi - - tar -zxvf zlib-1.2.11.tar.gz - cd zlib-1.2.11 - - ./configure --prefix=${SERVER_ROOT}/zlib && make && make install - - #cd $SOURCE_ROOT - #rm -rf zlib-1.2.11 - #rm -rf zlib-1.2.11.tar.gz -fi \ No newline at end of file diff --git a/plugins/php-ya/all_test.sh b/plugins/php-yum/all_test.sh similarity index 100% rename from plugins/php-ya/all_test.sh rename to plugins/php-yum/all_test.sh diff --git a/plugins/php-ya/conf/app_start.php b/plugins/php-yum/conf/app_start.php similarity index 100% rename from plugins/php-ya/conf/app_start.php rename to plugins/php-yum/conf/app_start.php diff --git a/plugins/php-ya/conf/enable-php.conf b/plugins/php-yum/conf/enable-php.conf similarity index 100% rename from plugins/php-ya/conf/enable-php.conf rename to plugins/php-yum/conf/enable-php.conf diff --git a/plugins/php-ya/conf/pathinfo.conf b/plugins/php-yum/conf/pathinfo.conf similarity index 100% rename from plugins/php-ya/conf/pathinfo.conf rename to plugins/php-yum/conf/pathinfo.conf diff --git a/plugins/php-ya/conf/php-fpm.conf b/plugins/php-yum/conf/php-fpm.conf similarity index 100% rename from plugins/php-ya/conf/php-fpm.conf rename to plugins/php-yum/conf/php-fpm.conf diff --git a/plugins/php-ya/conf/php7.ini b/plugins/php-yum/conf/php7.ini similarity index 100% rename from plugins/php-ya/conf/php7.ini rename to plugins/php-yum/conf/php7.ini diff --git a/plugins/php-ya/conf/php8.ini b/plugins/php-yum/conf/php8.ini similarity index 100% rename from plugins/php-ya/conf/php8.ini rename to plugins/php-yum/conf/php8.ini diff --git a/plugins/php-ya/conf/phpfpm_status.conf b/plugins/php-yum/conf/phpfpm_status.conf similarity index 100% rename from plugins/php-ya/conf/phpfpm_status.conf rename to plugins/php-yum/conf/phpfpm_status.conf diff --git a/plugins/php-ya/conf/phpinfo.conf b/plugins/php-yum/conf/phpinfo.conf similarity index 100% rename from plugins/php-ya/conf/phpinfo.conf rename to plugins/php-yum/conf/phpinfo.conf diff --git a/plugins/php-ya/conf/www.conf b/plugins/php-yum/conf/www.conf similarity index 100% rename from plugins/php-ya/conf/www.conf rename to plugins/php-yum/conf/www.conf diff --git a/plugins/php-ya/ico.png b/plugins/php-yum/ico.png similarity index 100% rename from plugins/php-ya/ico.png rename to plugins/php-yum/ico.png diff --git a/plugins/php-ya/index.html b/plugins/php-yum/index.html similarity index 52% rename from plugins/php-ya/index.html rename to plugins/php-yum/index.html index cb226863b..893f5bdad 100755 --- a/plugins/php-ya/index.html +++ b/plugins/php-yum/index.html @@ -2,21 +2,20 @@
-

服务

-

自启动

+

服务

+

自启动

安装扩展

配置修改

上传限制

超时限制

-

配置文件

-

FPM配置

+

配置文件

+

FPM配置

禁用函数

性能调整

负载状况

-

FPM日志

-

慢日志

+

FPM日志

+

慢日志

PHPIFNO

-

预加载脚本

@@ -25,7 +24,7 @@
\ No newline at end of file diff --git a/plugins/php-ya/index.py b/plugins/php-yum/index.py similarity index 99% rename from plugins/php-ya/index.py rename to plugins/php-yum/index.py index 887de68a3..d47713b50 100755 --- a/plugins/php-ya/index.py +++ b/plugins/php-yum/index.py @@ -8,11 +8,8 @@ import re import json import shutil -# reload(sys) -# sys.setdefaultencoding('utf8') sys.path.append(os.getcwd() + "/class/core") -# sys.path.append("/usr/local/lib/python3.6/site-packages") import mw @@ -28,7 +25,7 @@ if mw.isAppleSystem(): def getPluginName(): - return 'php-ya' + return 'php-yum' def getPluginDir(): diff --git a/plugins/php-ya/info.json b/plugins/php-yum/info.json similarity index 59% rename from plugins/php-ya/info.json rename to plugins/php-yum/info.json index 8fd43f47b..2723bc4ef 100755 --- a/plugins/php-ya/info.json +++ b/plugins/php-yum/info.json @@ -1,15 +1,15 @@ { "sort": 7, - "ps": "PHP是世界上最好的编程语言[YUM|APT]", + "ps": "PHP是世界上最好的编程语言[YUM]", "shell": "install.sh", - "name": "php-ya", - "title": "PHP[YA]", + "name": "php-yum", + "title": "PHP[YUM]", "coexist": true, "versions": ["81"], "install_pre_inspection":true, "tip": "soft", - "checks": "server/php-ya/VERSION/bin/php", - "path": "server/php-ya/VERSION", + "checks": "server/php-yum/VERSION/bin/php", + "path": "server/php-yum/VERSION", "display": 1, "author": "Zend", "date": "2022-07-07", diff --git a/plugins/php-ya/init.d/php.service.tpl b/plugins/php-yum/init.d/php.service.tpl similarity index 100% rename from plugins/php-ya/init.d/php.service.tpl rename to plugins/php-yum/init.d/php.service.tpl diff --git a/plugins/php-ya/init.d/php.tpl b/plugins/php-yum/init.d/php.tpl similarity index 100% rename from plugins/php-ya/init.d/php.tpl rename to plugins/php-yum/init.d/php.tpl diff --git a/plugins/php-ya/init.d/php52.tpl b/plugins/php-yum/init.d/php52.tpl similarity index 100% rename from plugins/php-ya/init.d/php52.tpl rename to plugins/php-yum/init.d/php52.tpl diff --git a/plugins/php-ya/install.sh b/plugins/php-yum/install.sh similarity index 60% rename from plugins/php-ya/install.sh rename to plugins/php-yum/install.sh index ea88124c0..572f9947a 100755 --- a/plugins/php-ya/install.sh +++ b/plugins/php-yum/install.sh @@ -31,22 +31,13 @@ if [ ! -d $curPath/versions/$2 ];then exit 0 fi -if [ "${action}" == "uninstall" ];then - - if [ -f /usr/lib/systemd/system/php-ya${type}.service ];then - systemctl stop php${type} - systemctl disable php${type} - rm -rf /usr/lib/systemd/system/php-ya${type}.service - systemctl daemon-reload - fi -fi cd ${curPath} && sh -x $curPath/versions/$2/install.sh $1 -if [ "${action}" == "install" ] && [ -d ${serverPath}/php-ya/${type} ];then +if [ "${action}" == "install" ] && [ -d ${serverPath}/php-yum/${type} ];then #初始化 - cd ${rootPath} && python3 ${rootPath}/plugins/php-ya/index.py start ${type} - cd ${rootPath} && python3 ${rootPath}/plugins/php-ya/index.py initd_install ${type} + cd ${rootPath} && python3 ${rootPath}/plugins/php-yum/index.py start ${type} + cd ${rootPath} && python3 ${rootPath}/plugins/php-yum/index.py initd_install ${type} fi diff --git a/plugins/php-ya/js/php.js b/plugins/php-yum/js/php.js similarity index 99% rename from plugins/php-ya/js/php.js rename to plugins/php-yum/js/php.js index b9fb0346a..24fb24788 100755 --- a/plugins/php-ya/js/php.js +++ b/plugins/php-yum/js/php.js @@ -13,7 +13,7 @@ function phpPost(method, version, args,callback){ var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); var req_data = {}; - req_data['name'] = 'php-ya'; + req_data['name'] = 'php-yum'; req_data['func'] = method; req_data['version'] = version; @@ -41,7 +41,7 @@ function phpPostCallbak(method, version, args,callback){ var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); var req_data = {}; - req_data['name'] = 'php-ya'; + req_data['name'] = 'php-yum'; req_data['func'] = method; args['version'] = version; diff --git a/plugins/php-ya/versions/71/install.sh b/plugins/php-yum/versions/71/install.sh similarity index 100% rename from plugins/php-ya/versions/71/install.sh rename to plugins/php-yum/versions/71/install.sh diff --git a/plugins/php-ya/versions/72/install.sh b/plugins/php-yum/versions/72/install.sh similarity index 100% rename from plugins/php-ya/versions/72/install.sh rename to plugins/php-yum/versions/72/install.sh diff --git a/plugins/php-ya/versions/73/install.sh b/plugins/php-yum/versions/73/install.sh similarity index 100% rename from plugins/php-ya/versions/73/install.sh rename to plugins/php-yum/versions/73/install.sh diff --git a/plugins/php-ya/versions/74/install.sh b/plugins/php-yum/versions/74/install.sh similarity index 100% rename from plugins/php-ya/versions/74/install.sh rename to plugins/php-yum/versions/74/install.sh diff --git a/plugins/php-ya/versions/80/install.sh b/plugins/php-yum/versions/80/install.sh similarity index 100% rename from plugins/php-ya/versions/80/install.sh rename to plugins/php-yum/versions/80/install.sh diff --git a/plugins/php-ya/versions/81/install.sh b/plugins/php-yum/versions/81/install.sh similarity index 74% rename from plugins/php-ya/versions/81/install.sh rename to plugins/php-yum/versions/81/install.sh index 6d64014ca..afed8f074 100755 --- a/plugins/php-ya/versions/81/install.sh +++ b/plugins/php-yum/versions/81/install.sh @@ -20,27 +20,18 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk - version=8.1.x PHP_VER=81 -Install_php_CentOS(){ -### centos start ################ -rpm -Uvh http://rpms.remirepo.net/enterprise/remi-release-#{VERSION_ID}.rpm -yum install php81 php81-php-fpm -### centos start ################ -} - -Uninstall_php_CentOS(){ -### centos start ################ -echo "uninstall centos" -### centos start ################ -} - Install_php() { #------------------------ install start ------------------------------------# +### centos start ################ +rpm -Uvh http://rpms.remirepo.net/enterprise/remi-release-${VERSION_ID}.rpm +yum install php81 php81-php-fpm +### centos start ################ -if [ "$OSNAME" == 'centos' ];then - Install_php_CentOS +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-yum/${PHP_VER} fi #------------------------ install end ------------------------------------# @@ -48,12 +39,8 @@ fi Uninstall_php() { - if [ "$OSNAME" == 'centos' ];then - Uninstall_php_CentOS - fi - # $serverPath/php-ya/init.d/php${PHP_VER} stop - rm -rf $serverPath/php-ya/${PHP_VER} + rm -rf $serverPath/php-yum/${PHP_VER} echo "卸载php-${version}..." > $install_tmp } diff --git a/plugins/php-ya/versions/common/exif.sh b/plugins/php-yum/versions/common/exif.sh similarity index 100% rename from plugins/php-ya/versions/common/exif.sh rename to plugins/php-yum/versions/common/exif.sh diff --git a/plugins/php-ya/versions/common/fileinfo.sh b/plugins/php-yum/versions/common/fileinfo.sh similarity index 100% rename from plugins/php-ya/versions/common/fileinfo.sh rename to plugins/php-yum/versions/common/fileinfo.sh diff --git a/plugins/php-ya/versions/common/gd.sh b/plugins/php-yum/versions/common/gd.sh similarity index 100% rename from plugins/php-ya/versions/common/gd.sh rename to plugins/php-yum/versions/common/gd.sh diff --git a/plugins/php-ya/versions/common/imagemagick.sh b/plugins/php-yum/versions/common/imagemagick.sh similarity index 100% rename from plugins/php-ya/versions/common/imagemagick.sh rename to plugins/php-yum/versions/common/imagemagick.sh diff --git a/plugins/php-ya/versions/common/intl.sh b/plugins/php-yum/versions/common/intl.sh similarity index 100% rename from plugins/php-ya/versions/common/intl.sh rename to plugins/php-yum/versions/common/intl.sh diff --git a/plugins/php-ya/versions/common/mcrypt.sh b/plugins/php-yum/versions/common/mcrypt.sh similarity index 100% rename from plugins/php-ya/versions/common/mcrypt.sh rename to plugins/php-yum/versions/common/mcrypt.sh diff --git a/plugins/php-ya/versions/common/memcached.sh b/plugins/php-yum/versions/common/memcached.sh similarity index 100% rename from plugins/php-ya/versions/common/memcached.sh rename to plugins/php-yum/versions/common/memcached.sh diff --git a/plugins/php-ya/versions/common/mongodb.sh b/plugins/php-yum/versions/common/mongodb.sh similarity index 100% rename from plugins/php-ya/versions/common/mongodb.sh rename to plugins/php-yum/versions/common/mongodb.sh diff --git a/plugins/php-ya/versions/common/opcache.sh b/plugins/php-yum/versions/common/opcache.sh similarity index 100% rename from plugins/php-ya/versions/common/opcache.sh rename to plugins/php-yum/versions/common/opcache.sh diff --git a/plugins/php-ya/versions/common/openssl.sh b/plugins/php-yum/versions/common/openssl.sh similarity index 100% rename from plugins/php-ya/versions/common/openssl.sh rename to plugins/php-yum/versions/common/openssl.sh diff --git a/plugins/php-ya/versions/common/pcntl.sh b/plugins/php-yum/versions/common/pcntl.sh similarity index 100% rename from plugins/php-ya/versions/common/pcntl.sh rename to plugins/php-yum/versions/common/pcntl.sh diff --git a/plugins/php-ya/versions/common/redis.sh b/plugins/php-yum/versions/common/redis.sh similarity index 100% rename from plugins/php-ya/versions/common/redis.sh rename to plugins/php-yum/versions/common/redis.sh diff --git a/plugins/php-ya/versions/common/seaslog.sh b/plugins/php-yum/versions/common/seaslog.sh similarity index 100% rename from plugins/php-ya/versions/common/seaslog.sh rename to plugins/php-yum/versions/common/seaslog.sh diff --git a/plugins/php-ya/versions/common/solr.sh b/plugins/php-yum/versions/common/solr.sh similarity index 100% rename from plugins/php-ya/versions/common/solr.sh rename to plugins/php-yum/versions/common/solr.sh diff --git a/plugins/php-ya/versions/common/swoole.sh b/plugins/php-yum/versions/common/swoole.sh similarity index 100% rename from plugins/php-ya/versions/common/swoole.sh rename to plugins/php-yum/versions/common/swoole.sh diff --git a/plugins/php-ya/versions/common/xdebug.sh b/plugins/php-yum/versions/common/xdebug.sh similarity index 100% rename from plugins/php-ya/versions/common/xdebug.sh rename to plugins/php-yum/versions/common/xdebug.sh diff --git a/plugins/php-ya/versions/common/xhprof.sh b/plugins/php-yum/versions/common/xhprof.sh similarity index 100% rename from plugins/php-ya/versions/common/xhprof.sh rename to plugins/php-yum/versions/common/xhprof.sh diff --git a/plugins/php-ya/versions/common/yac.sh b/plugins/php-yum/versions/common/yac.sh similarity index 100% rename from plugins/php-ya/versions/common/yac.sh rename to plugins/php-yum/versions/common/yac.sh diff --git a/plugins/php-ya/versions/common/yaf.sh b/plugins/php-yum/versions/common/yaf.sh similarity index 100% rename from plugins/php-ya/versions/common/yaf.sh rename to plugins/php-yum/versions/common/yaf.sh diff --git a/plugins/php-ya/versions/common/yar.sh b/plugins/php-yum/versions/common/yar.sh similarity index 100% rename from plugins/php-ya/versions/common/yar.sh rename to plugins/php-yum/versions/common/yar.sh diff --git a/plugins/php-ya/versions/common/zip.sh b/plugins/php-yum/versions/common/zip.sh similarity index 100% rename from plugins/php-ya/versions/common/zip.sh rename to plugins/php-yum/versions/common/zip.sh diff --git a/plugins/php-ya/versions/common/zlib.sh b/plugins/php-yum/versions/common/zlib.sh similarity index 100% rename from plugins/php-ya/versions/common/zlib.sh rename to plugins/php-yum/versions/common/zlib.sh diff --git a/plugins/php-ya/versions/lib.sh b/plugins/php-yum/versions/lib.sh similarity index 100% rename from plugins/php-ya/versions/lib.sh rename to plugins/php-yum/versions/lib.sh diff --git a/plugins/php-ya/versions/phplib.conf b/plugins/php-yum/versions/phplib.conf similarity index 100% rename from plugins/php-ya/versions/phplib.conf rename to plugins/php-yum/versions/phplib.conf