diff --git a/plugins/php-apt/all_test.sh b/plugins/php-apt/all_test.sh deleted file mode 100644 index 59bd64c08..000000000 --- a/plugins/php-apt/all_test.sh +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -export PATH=$PATH:/opt/local/bin:/opt/local/sbin:/opt/local/share/man:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin -DIR=$(cd "$(dirname "$0")"; pwd) - - - -# cd /www/server/mdserver-web/scripts/quick && bash debug.sh -# cd /www/server/mdserver-web/plugins/php && bash all_test.sh - - -# cd /www/server/mdserver-web/plugins/php && bash install.sh install 71 -# cd /www/server/mdserver-web/plugins/php/versions/52/ && bash gd.sh install 52 - -# cd /www/server/mdserver-web/plugins/php/versions/52/ && bash openssl.sh install 52 -# cd /www/server/mdserver-web/plugins/php/versions/81/ && bash imagemagick.sh install 81 -# cd /www/server/mdserver-web/plugins/php/versions/70/ && bash imagemagick.sh install 70 - -PHP_VER=71 -echo "php${PHP_VER} -- start" -cmd_ext=$(ls -l $DIR/versions/$PHP_VER/ |awk '{print $9}') -cd $DIR && /bin/bash install.sh install $PHP_VER -for ii in $cmd_ext -do - if [ "install.sh" == "$ii" ];then - echo '' > /tmp/t.log - else - cd $DIR/versions/$PHP_VER && /bin/bash $ii install $PHP_VER - fi -done -echo "php${PHP_VER} -- end" - - -PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81) -# PHP_VER_LIST=(81) -for PHP_VER in ${PHP_VER_LIST[@]}; do - echo "php${PHP_VER} -- start" - if [ -d /www/server/php/${PHP_VER} ];then - cmd_ext=$(ls -l $DIR/versions/$PHP_VER/ |awk '{print $9}') - for ii in $cmd_ext - do - echo "${ii}" - if [ "install.sh" == "$ii" ];then - echo '' > /tmp/t.log - else - cd $DIR/versions/$PHP_VER/ && bash $ii install ${PHP_VER} - fi - done - fi - echo "php${PHP_VER} -- end" -done - - -rm -rf /tmp/t.log diff --git a/plugins/php-apt/info.json b/plugins/php-apt/info.json index 61b089eb9..328522521 100755 --- a/plugins/php-apt/info.json +++ b/plugins/php-apt/info.json @@ -5,7 +5,7 @@ "name": "php-apt", "title": "PHP[APT]", "coexist": true, - "versions": ["74","80","81"], + "versions": ["56","70","71","72","73","74","80","81"], "install_pre_inspection":true, "tip": "soft", "checks": "server/php-apt/VERSION", diff --git a/plugins/php-apt/install.sh b/plugins/php-apt/install.sh index a512121c6..92e36f400 100755 --- a/plugins/php-apt/install.sh +++ b/plugins/php-apt/install.sh @@ -56,6 +56,7 @@ cd ${curPath} && sh -x $curPath/versions/$2/install.sh $1 if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then #初始化 cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py start ${type} + cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py restart ${type} cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py initd_install ${type} fi diff --git a/plugins/php-apt/versions/56/install.sh b/plugins/php-apt/versions/56/install.sh new file mode 100755 index 000000000..be1c2b6e6 --- /dev/null +++ b/plugins/php-apt/versions/56/install.sh @@ -0,0 +1,49 @@ +#!/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=5.6 +PHP_VER=56 + + +Install_php() +{ +#------------------------ install start ------------------------------------# +apt -y install php${version} php${version}-fpm +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-apt/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ +#------------------------ uninstall start ------------------------------------# +apt -y remove php${version} php${version}-fpm +rm -rf $serverPath/php-apt/${PHP_VER} +echo "卸载php-${version}..." > $install_tmp +#------------------------ uninstall start ------------------------------------# +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-apt/versions/70/install.sh b/plugins/php-apt/versions/70/install.sh new file mode 100755 index 000000000..bf00cdf02 --- /dev/null +++ b/plugins/php-apt/versions/70/install.sh @@ -0,0 +1,49 @@ +#!/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=7.0 +PHP_VER=70 + + +Install_php() +{ +#------------------------ install start ------------------------------------# +apt -y install php${version} php${version}-fpm +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-apt/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ +#------------------------ uninstall start ------------------------------------# +apt -y remove php${version} php${version}-fpm +rm -rf $serverPath/php-apt/${PHP_VER} +echo "卸载php-${version}..." > $install_tmp +#------------------------ uninstall start ------------------------------------# +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-apt/versions/71/install.sh b/plugins/php-apt/versions/71/install.sh new file mode 100755 index 000000000..623c1e40c --- /dev/null +++ b/plugins/php-apt/versions/71/install.sh @@ -0,0 +1,49 @@ +#!/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=7.1 +PHP_VER=71 + + +Install_php() +{ +#------------------------ install start ------------------------------------# +apt -y install php${version} php${version}-fpm +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-apt/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ +#------------------------ uninstall start ------------------------------------# +apt -y remove php${version} php${version}-fpm +rm -rf $serverPath/php-apt/${PHP_VER} +echo "卸载php-${version}..." > $install_tmp +#------------------------ uninstall start ------------------------------------# +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-apt/versions/72/install.sh b/plugins/php-apt/versions/72/install.sh new file mode 100755 index 000000000..2ff80628a --- /dev/null +++ b/plugins/php-apt/versions/72/install.sh @@ -0,0 +1,49 @@ +#!/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=7.2 +PHP_VER=72 + + +Install_php() +{ +#------------------------ install start ------------------------------------# +apt -y install php${version} php${version}-fpm +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-apt/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ +#------------------------ uninstall start ------------------------------------# +apt -y remove php${version} php${version}-fpm +rm -rf $serverPath/php-apt/${PHP_VER} +echo "卸载php-${version}..." > $install_tmp +#------------------------ uninstall start ------------------------------------# +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-apt/versions/73/install.sh b/plugins/php-apt/versions/73/install.sh new file mode 100755 index 000000000..bd856a053 --- /dev/null +++ b/plugins/php-apt/versions/73/install.sh @@ -0,0 +1,49 @@ +#!/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=7.3 +PHP_VER=73 + + +Install_php() +{ +#------------------------ install start ------------------------------------# +apt -y install php${version} php${version}-fpm +if [ "$?" == "0" ];then + mkdir -p $serverPath/php-apt/${PHP_VER} +fi + +#------------------------ install end ------------------------------------# +} + +Uninstall_php() +{ +#------------------------ uninstall start ------------------------------------# +apt -y remove php${version} php${version}-fpm +rm -rf $serverPath/php-apt/${PHP_VER} +echo "卸载php-${version}..." > $install_tmp +#------------------------ uninstall start ------------------------------------# +} + +action=${1} +if [ "${1}" == 'install' ];then + Install_php +else + Uninstall_php +fi diff --git a/plugins/php-apt/versions/74/install.sh b/plugins/php-apt/versions/74/install.sh index bd70cc4bc..9ce79e69c 100755 --- a/plugins/php-apt/versions/74/install.sh +++ b/plugins/php-apt/versions/74/install.sh @@ -17,14 +17,14 @@ 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=7.4.x +version=7.4 PHP_VER=74 Install_php() { #------------------------ install start ------------------------------------# -apt -y install php7.4 php7.4-fpm +apt -y install php${version} php${version}-fpm if [ "$?" == "0" ];then mkdir -p $serverPath/php-apt/${PHP_VER} fi @@ -35,7 +35,7 @@ fi Uninstall_php() { #------------------------ uninstall start ------------------------------------# -apt -y remove php7.4 ph7.4-fpm +apt -y remove php${version} php${version}-fpm rm -rf $serverPath/php-apt/${PHP_VER} echo "卸载php-${version}..." > $install_tmp #------------------------ uninstall start ------------------------------------# diff --git a/plugins/php-apt/versions/80/install.sh b/plugins/php-apt/versions/80/install.sh index 8f00b78f7..feb7c3eec 100755 --- a/plugins/php-apt/versions/80/install.sh +++ b/plugins/php-apt/versions/80/install.sh @@ -17,14 +17,14 @@ 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.0.x +version=8.0 PHP_VER=80 Install_php() { #------------------------ install start ------------------------------------# -apt -y install php8.0 php8.0-fpm +apt -y install php${version} php${version}-fpm if [ "$?" == "0" ];then mkdir -p $serverPath/php-apt/${PHP_VER} fi @@ -35,7 +35,7 @@ fi Uninstall_php() { #------------------------ uninstall start ------------------------------------# -apt -y remove php8.0 php8.0-fpm +apt -y remove php${version} php${version}-fpm rm -rf $serverPath/php-apt/${PHP_VER} echo "卸载php-${version}..." > $install_tmp #------------------------ uninstall start ------------------------------------# diff --git a/plugins/php-apt/versions/81/install.sh b/plugins/php-apt/versions/81/install.sh index 3afba9b8d..25b5ce428 100755 --- a/plugins/php-apt/versions/81/install.sh +++ b/plugins/php-apt/versions/81/install.sh @@ -17,14 +17,14 @@ 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.1.x +version=8.1 PHP_VER=81 Install_php() { #------------------------ install start ------------------------------------# -apt -y install php8.1 php8.1-fpm +apt -y install php${version} php${version}-fpm if [ "$?" == "0" ];then mkdir -p $serverPath/php-apt/${PHP_VER} fi @@ -35,7 +35,7 @@ fi Uninstall_php() { #------------------------ uninstall start ------------------------------------# -apt -y remove php8.1 php8.1-fpm +apt -y remove php${version} php${version}-fpm rm -rf $serverPath/php-apt/${PHP_VER} echo "卸载php-${version}..." > $install_tmp #------------------------ uninstall start ------------------------------------#