diff --git a/class/core/site_api.py b/class/core/site_api.py index fd7c1487c..895687443 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -2036,6 +2036,13 @@ location ~* ^{from}(.*)$ { data.append(tmp) # 其他PHP安装类型 + conf_dir = mw.getServerDir() + "/web_conf/php/conf" + rlist = os.listdir(rPath) + l = len(rlist) + for name in rlist: + path = conf_dir + name + print(name) + print(path) return mw.getJson(data) diff --git a/plugins/php-yum/info.json b/plugins/php-yum/info.json index 5c5eae692..7891dff00 100755 --- a/plugins/php-yum/info.json +++ b/plugins/php-yum/info.json @@ -5,7 +5,7 @@ "name": "php-yum", "title": "PHP[YUM]", "coexist": true, - "versions": ["74","80","81"], + "versions": ["74","80","81","82"], "install_pre_inspection":true, "tip": "soft", "checks": "server/php-yum/VERSION", diff --git a/plugins/php-yum/versions/82/install.sh b/plugins/php-yum/versions/82/install.sh new file mode 100755 index 000000000..100542c2b --- /dev/null +++ b/plugins/php-yum/versions/82/install.sh @@ -0,0 +1,52 @@ +#!/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") +serverPath=$(dirname "$rootPath") +sourcePath=${serverPath}/source +sysName=`uname` +install_tmp=${rootPath}/tmp/mw_install.pl + + +#获取信息和版本 +# bash /www/server/mdsever-web/scripts/getos.sh +bash ${rootPath}/scripts/getos.sh +OSNAME=`cat ${rootPath}/data/osname.pl` +VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'` + +version=8.2.x +PHP_VER=82 + + +Install_php() +{ +#------------------------ install start ------------------------------------# + +### centos start ################ +rpm -Uvh http://rpms.remirepo.net/enterprise/remi-release-${VERSION_ID}.rpm +yum install -y php82 php82-php-fpm +### centos start ################ + +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-yum/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ + # $serverPath/php-ya/init.d/php${PHP_VER} stop + rm -rf $serverPath/php-yum/${PHP_VER} + echo "卸载php-${version}..." > $install_tmp +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-yum/versions/phplib.conf b/plugins/php-yum/versions/phplib.conf index a0653454e..6c5e6e1a0 100755 --- a/plugins/php-yum/versions/phplib.conf +++ b/plugins/php-yum/versions/phplib.conf @@ -9,7 +9,7 @@ "81" ], "type": "数据库", - "msg": "用于使用MySQL数据库的PHP应用程序的模块!", + "msg": "用于使用MySQL数据库的模块!", "shell": "mysqlnd.sh", "check": "mysqlnd" }, @@ -23,7 +23,7 @@ "81" ], "type": "数据库", - "msg": "用于使用OCI8数据库的PHP应用程序的模块!", + "msg": "用于使用OCI8数据库的模块!", "shell": "oci8.sh", "check": "oci8" }, @@ -37,7 +37,7 @@ "81" ], "type": "数据库", - "msg": "用于使用ODBC数据库的PHP应用程序的模块!", + "msg": "用于使用ODBC数据库的模块!", "shell": "odbc.sh", "check": "odbc" }, @@ -258,7 +258,7 @@ "check": "apc" }, { - "name": "imagemagick", + "name": "imagick", "versions": [ "54", "55", @@ -273,7 +273,7 @@ ], "type": "通用扩展", "msg": "比GD更强大的图形库", - "shell": "imagemagick.sh", + "shell": "imagick.sh", "check": "imagick" }, {