From ff32ab721f4cd516f62fc2710b403ae119e0adb2 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 22:46:10 +0800 Subject: [PATCH 01/15] Update info.json --- plugins/redis/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/redis/info.json b/plugins/redis/info.json index 0967b8f48..32ed20fb5 100755 --- a/plugins/redis/info.json +++ b/plugins/redis/info.json @@ -4,8 +4,8 @@ "name": "redis", "title": "Redis", "shell": "install.sh", - "versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"], - "updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12"], + "versions":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12","7.2.2"], + "updates":["4.0.11","5.0.8","6.0.4","6.2.7","7.0.12","7.2.2"], "tip": "soft", "checks": "server/redis", "path": "server/redis", From 5e91ac8fe9d4531ed704846c29f71fd4644631ad Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 22:49:26 +0800 Subject: [PATCH 02/15] Update install.sh --- plugins/php/versions/81/install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 16befd936..cbe7ca8de 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -version=8.1.22 +version=8.1.24 PHP_VER=81 Install_php() { @@ -50,8 +50,11 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi fi # ----------------------------------------------------------------------- # - + if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz + fi + #检测文件是否损坏. md5_file_ok=b3a403d00c28d5e33c0c5b7464d27671 if [ -f $sourcePath/php/php-${version}.tar.xz ];then @@ -62,10 +65,6 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi fi - if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz - fi - cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER} fi From 1937a6344e363284322270f7108938b729f2c811 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 22:54:59 +0800 Subject: [PATCH 03/15] =?UTF-8?q?php=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/php/info.json | 2 +- plugins/php/versions/80/install.sh | 12 ++++++------ plugins/php/versions/81/install.sh | 4 ++-- plugins/php/versions/82/install.sh | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/php/info.json b/plugins/php/info.json index 370874866..0e43b7810 100755 --- a/plugins/php/info.json +++ b/plugins/php/info.json @@ -6,7 +6,7 @@ "title": "PHP", "coexist": true, "versions": ["53","54","55","56","70","71","72","73","74","80","81","82","83"], - "updates": ["5.3.29","5.4.45","5.6.36","7.0.30","7.1.33","7.2.32","7.3.20","7.4.30","8.0.30","8.1.8","8.2.9","8.3.0"], + "updates": ["5.3.29","5.4.45","5.6.36","7.0.30","7.1.33","7.2.32","7.3.20","7.4.30","8.0.30","8.1.24","8.2.11","8.3.0"], "tip": "soft", "install_pre_inspection":true, "checks": "server/php/VERSION/bin/php", diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index e8e65afb2..33edc1551 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -51,19 +51,19 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi # ----------------------------------------------------------------------- # + if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz + fi + #检测文件是否损坏. - md5_file_ok=453206c948d9504b91fcec30fcb59b75 + md5_file_ok=216ab305737a5d392107112d618a755dc5df42058226f1670e9db90e77d777d9 if [ -f $sourcePath/php/php-${version}.tar.xz ];then - md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` + md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` if [ "${md5_file}" != "${md5_file_ok}" ]; then echo "PHP${version} 下载文件不完整,重新安装" rm -rf $sourcePath/php/php-${version}.tar.xz fi fi - - if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz - fi cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER} diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index cbe7ca8de..649ac66a5 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -56,9 +56,9 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi #检测文件是否损坏. - md5_file_ok=b3a403d00c28d5e33c0c5b7464d27671 + md5_file_ok=ee61f6232bb29bd2e785daf325d2177f2272bf80d086c295a724594e710bce3d if [ -f $sourcePath/php/php-${version}.tar.xz ];then - md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` + md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` if [ "${md5_file}" != "${md5_file_ok}" ]; then echo "PHP${version} 下载文件不完整,重新安装" rm -rf $sourcePath/php/php-${version}.tar.xz diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 978c0768f..4d9033237 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -version=8.2.9 +version=8.2.11 PHP_VER=82 Install_php() { @@ -52,19 +52,19 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then # ----------------------------------------------------------------------- # + if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz + fi + #检测文件是否损坏. - md5_file_ok=897c9c416663d03e516a68cb86b598f3 + md5_file_ok=29af82e4f7509831490552918aad502697453f0869a579ee1b80b08f9112c5b8 if [ -f $sourcePath/php/php-${version}.tar.xz ];then - md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` + md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` if [ "${md5_file}" != "${md5_file_ok}" ]; then echo "PHP${version} 下载文件不完整,重新安装" rm -rf $sourcePath/php/php-${version}.tar.xz fi fi - - if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz - fi cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz mv $sourcePath/php/php-${version} $sourcePath/php/php${PHP_VER} From 061c2d86ebf6c2a722d2c592a3632d62eb348c55 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 22:57:34 +0800 Subject: [PATCH 04/15] Update install.sh --- plugins/mysql-apt/versions/8.0/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/mysql-apt/versions/8.0/install.sh b/plugins/mysql-apt/versions/8.0/install.sh index 9746c2901..caf2ab290 100755 --- a/plugins/mysql-apt/versions/8.0/install.sh +++ b/plugins/mysql-apt/versions/8.0/install.sh @@ -108,6 +108,7 @@ Install_mysql() echo '8.0' > $serverPath/mysql-apt/version.pl echo '安装完成' > $install_tmp else + echo '8.0' > $serverPath/mysql-apt/version.pl echo "暂时不支持该系统" > $install_tmp fi } From 9342e31faff3675b34fe69caf3c5f6f47ecdcf54 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:01:50 +0800 Subject: [PATCH 05/15] Update install.sh --- plugins/mysql-apt/versions/8.0/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/mysql-apt/versions/8.0/install.sh b/plugins/mysql-apt/versions/8.0/install.sh index caf2ab290..7fc33b3df 100755 --- a/plugins/mysql-apt/versions/8.0/install.sh +++ b/plugins/mysql-apt/versions/8.0/install.sh @@ -22,6 +22,11 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk - # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.0 +# 暂时debian12没有标准版,先用11使用 +if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then + VERSION_ID='11' +fi + ARCH="amd64" TMP_ARCH=`arch` @@ -39,7 +44,7 @@ if [ "$ARCH" != "amd64" ];then fi -MYSQL_VER=8.0.30 +MYSQL_VER=8.0.33 SUFFIX_NAME=${MYSQL_VER}-1${OSNAME}${VERSION_ID}_${ARCH} From de6ed476fb36577bd55aeecb8f0968fee049bb8d Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:13:38 +0800 Subject: [PATCH 06/15] Update install.sh --- plugins/mysql-apt/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/mysql-apt/install.sh b/plugins/mysql-apt/install.sh index c95756c58..059881983 100755 --- a/plugins/mysql-apt/install.sh +++ b/plugins/mysql-apt/install.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.0 # cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh uninstall 8.0 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.0 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py fix_db_access install_tmp=${rootPath}/tmp/mw_install.pl From 8324a89edb0a05b233b97240b002bac9372f50a6 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:17:21 +0800 Subject: [PATCH 07/15] Update install.sh --- plugins/mysql-apt/versions/8.0/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mysql-apt/versions/8.0/install.sh b/plugins/mysql-apt/versions/8.0/install.sh index 7fc33b3df..51044e6f4 100755 --- a/plugins/mysql-apt/versions/8.0/install.sh +++ b/plugins/mysql-apt/versions/8.0/install.sh @@ -24,7 +24,8 @@ VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk - # 暂时debian12没有标准版,先用11使用 if [ "$OSNAME" == 'debian' ] && [ "$VERSION_ID" == '12' ] ;then - VERSION_ID='11' + echo "暂时不支持该${OSNAME}${VERSION_ID}" > $install_tmp + exit 1 fi From 5aead0ad7c933993128f3f3b34e0eaa597d47b2a Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:19:33 +0800 Subject: [PATCH 08/15] Update index.py --- plugins/mysql-apt/index.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index fea020947..0b1ef3ffa 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -2738,6 +2738,9 @@ def installPreInspection(version): return '仅支持debian,ubuntu' if (sysName == 'debian' and not sysId in('12', '11', '10')): + + if sysId == '12' and version == '8.0': + return 'debian12,暂时不支持8.0' return 'debian支持10,11,12' if (sysName == 'ubuntu' and version == '5.7' and not sysId in ('18.04')): From 4a0969534307a4aac04f2b8b23be474ddf019993 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:19:41 +0800 Subject: [PATCH 09/15] Update index.py --- plugins/mysql-apt/index.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 0b1ef3ffa..30f1b134c 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -2738,7 +2738,6 @@ def installPreInspection(version): return '仅支持debian,ubuntu' if (sysName == 'debian' and not sysId in('12', '11', '10')): - if sysId == '12' and version == '8.0': return 'debian12,暂时不支持8.0' return 'debian支持10,11,12' From af8f9fb1a90f7893fd8f522361d5ef66da236edd Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:21:49 +0800 Subject: [PATCH 10/15] Update index.py --- plugins/mysql-apt/index.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 30f1b134c..3f38ca244 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -2738,10 +2738,11 @@ def installPreInspection(version): return '仅支持debian,ubuntu' if (sysName == 'debian' and not sysId in('12', '11', '10')): - if sysId == '12' and version == '8.0': - return 'debian12,暂时不支持8.0' return 'debian支持10,11,12' + if sysName == 'debian' and sysId == '12' and version == '8.0': + return 'debian12,暂时不支持8.0' + if (sysName == 'ubuntu' and version == '5.7' and not sysId in ('18.04')): return "Ubuntu Apt MySQL[" + version + "] 仅支持18.04" From 89991b841796224d5004e1b54f3d97b2a4f25654 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:24:12 +0800 Subject: [PATCH 11/15] Update install.sh --- plugins/memcached/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/memcached/install.sh b/plugins/memcached/install.sh index 3801872a1..156603636 100755 --- a/plugins/memcached/install.sh +++ b/plugins/memcached/install.sh @@ -10,7 +10,7 @@ serverPath=$(dirname "$rootPath") install_tmp=${rootPath}/tmp/mw_install.pl -VERSION=1.6.15 +VERSION=1.6.22 Install_mem(){ mkdir -p $serverPath/source From 929ead12bc16d7dc8495248b3715ded83fee1f3b Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:28:06 +0800 Subject: [PATCH 12/15] Update install.sh --- plugins/php/versions/83/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index f4ed65d0a..29a9e4a67 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -15,7 +15,7 @@ function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -version=8.3.0alpha2 +version=8.3.0RC4 PHP_VER=83 Install_php() { From d618f36f89866da8961cb85f6db1a9b2eae33ed9 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:28:25 +0800 Subject: [PATCH 13/15] Update install.sh --- plugins/php/versions/83/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh index 29a9e4a67..57ef5c78c 100755 --- a/plugins/php/versions/83/install.sh +++ b/plugins/php/versions/83/install.sh @@ -56,9 +56,9 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then fi #检测文件是否损坏. - # md5_file_ok=5c5b1960276e24b1a7a1b3a9817738e8 + # md5_file_ok=29af82e4f7509831490552918aad502697453f0869a579ee1b80b08f9112c5b8 # if [ -f $sourcePath/php/php-${version}.tar.xz ];then - # md5_file=`md5sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` + # md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz | awk '{print $1}'` # if [ "${md5_file}" != "${md5_file_ok}" ]; then # echo "PHP${version} 下载文件不完整,重新安装" # rm -rf $sourcePath/php/php-${version}.tar.xz From a9aaf268fc8a5df0b96aef7c5d67e1b944582cae Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:31:50 +0800 Subject: [PATCH 14/15] Update install.sh --- plugins/sphinx/install.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugins/sphinx/install.sh b/plugins/sphinx/install.sh index 617f089de..338a82404 100755 --- a/plugins/sphinx/install.sh +++ b/plugins/sphinx/install.sh @@ -21,6 +21,8 @@ if [ ${OSNAME} == "centos" ] || yum install -y postgresql-libs unixODBC fi + +VERSION=3.1.1 Install_sphinx() { @@ -30,28 +32,28 @@ Install_sphinx() SPHINX_DIR=${serverPath}/source/sphinx mkdir -p $SPHINX_DIR - if [ ! -f ${SPHINX_DIR}/sphinx-3.1.1.tar.gz ];then + if [ ! -f ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz ];then if [ $sysName == 'Darwin' ]; then - wget -O ${SPHINX_DIR}/sphinx-3.1.1.tar.gz http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-darwin-amd64.tar.gz + wget -O ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz http://sphinxsearch.com/files/sphinx-${VERSION}-612d99f-darwin-amd64.tar.gz else - curl -sSLo ${SPHINX_DIR}/sphinx-3.1.1.tar.gz http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz + curl -sSLo ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz http://sphinxsearch.com/files/sphinx-${VERSION}-612d99f-linux-amd64.tar.gz fi fi - if [ ! -f ${SPHINX_DIR}/sphinx-3.1.1.tar.gz ];then - curl -sSLo ${SPHINX_DIR}/sphinx-3.1.1.tar.gz https://github.com/midoks/mdserver-web/releases/download/init/sphinx-3.1.1.tar.gz + if [ ! -f ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz ];then + curl -sSLo ${SPHINX_DIR}/sphinx-${VERSION}.tar.gz https://github.com/midoks/mdserver-web/releases/download/init/sphinx-${VERSION}.tar.gz fi - cd ${SPHINX_DIR} && tar -zxvf sphinx-3.1.1.tar.gz + cd ${SPHINX_DIR} && tar -zxvf sphinx-${VERSION}.tar.gz if [ "$?" == "0" ];then mkdir -p $SPHINX_DIR - cp -rf ${SPHINX_DIR}/sphinx-3.1.1/ $serverPath/sphinx/bin + cp -rf ${SPHINX_DIR}/sphinx-${VERSION}/ $serverPath/sphinx/bin fi if [ -d $serverPath/sphinx ];then - echo '3.1.1' > $serverPath/sphinx/version.pl + echo "${VERSION}" > $serverPath/sphinx/version.pl echo '安装完成' > $install_tmp cd ${rootPath} && python3 ${rootPath}/plugins/sphinx/index.py start cd ${rootPath} && python3 ${rootPath}/plugins/sphinx/index.py initd_install From 1ad11de98efa0a1fe035b5ebb2f2d070b0c0ed0f Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Oct 2023 23:34:18 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/config_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class/core/config_api.py b/class/core/config_api.py index f60021c7a..1bd10db68 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ from flask import request class config_api: - __version = '0.16.1.5' + __version = '0.16.1.6' __api_addr = 'data/api.json' def __init__(self):