feat: update v2.0.10

scripts/install_panel.sh

@@ -165,7 +165,7 @@ Init_Panel() {
     mkdir ${setup_Path}/server
     mkdir ${setup_Path}/server/cron
     mkdir ${setup_Path}/server/cron/logs
-    chmod -R 644 ${setup_Path}/server
+    chmod -R 755 ${setup_Path}/server
     mkdir ${setup_Path}/panel
     rm -rf ${setup_Path}/panel/*
     # 下载面板zip包并解压

scripts/mysql/install.sh

@@ -266,16 +266,13 @@ elif [[ ${memTotal} -ge 32768 ]]; then
     sed -i "s#^innodb_log_buffer_size.*#innodb_log_buffer_size = 512M#" ${mysqlPath}/conf/my.cnf
 fi
 
-chmod 644 ${mysqlPath}/conf/my.cnf
-chown -R mysql:mysql ${mysqlPath}
-chmod -R 755 ${mysqlPath}
-
 # 初始化
 rm -rf ${mysqlPath}/src
 rm -rf ${mysqlPath}/data
 mkdir -p ${mysqlPath}/data
 chown -R mysql:mysql ${mysqlPath}
 chmod -R 755 ${mysqlPath}
+chmod 644 ${mysqlPath}/conf/my.cnf
 
 ${mysqlPath}/bin/mysqld --initialize-insecure --user=mysql --basedir=${mysqlPath} --datadir=${mysqlPath}/data
 
@@ -284,7 +281,7 @@ source /etc/profile
 
 # 启动
 cp ${mysqlPath}/lib/systemd/system/mysqld.service /etc/systemd/system/mysqld.service
-sed -i "/ExecStartPre/d" /etc/systemd/system/mysqld.service
+sed -i '/ExecStartPre/d' /etc/systemd/system/mysqld.service
 
 systemctl daemon-reload
 systemctl enable mysqld
@@ -292,7 +289,7 @@ systemctl start mysqld
 
 ${mysqlPath}/bin/mysqladmin -u root password ${mysqlPassword}
 
-panel writePlugin mysqsl${1} ${mysqlVersion}
+panel writePlugin mysql${1} ${mysqlVersion}
 panel writeMysqlPassword ${mysqlPassword}
 
 echo -e "${HR}\nMySQL-${1} 安装完成\n${HR}"

scripts/openresty/install.sh

@@ -39,10 +39,10 @@ if [ "${OS}" == "centos" ]; then
     /usr/bin/crb enable
     dnf makecache
     dnf groupinstall "Development Tools" -y
-    dnf install tar unzip gd gd-devel git-core flex perl perl-CPAN oniguruma oniguruma-devel libsodium-devel libxml2-devel libxslt-devel GeoIP-devel bison yajl yajl-devel curl curl-devel libtermcap-devel ncurses-devel libevent-devel readline-devel libuuid-devel brotli-devel icu libicu libicu-devel openssl openssl-devel -y
+    dnf install tar unzip gd gd-devel git-core flex perl oniguruma oniguruma-devel libsodium-devel libxml2-devel libxslt-devel GeoIP-devel bison yajl yajl-devel curl curl-devel libtermcap-devel ncurses-devel libevent-devel readline-devel libuuid-devel brotli-devel icu libicu libicu-devel openssl openssl-devel -y
 elif [ "${OS}" == "debian" ]; then
     apt update
-    apt install build-essential tar unzip libgd3 libgd-dev git flex perl perl-modules libonig-dev libsodium-dev libxml2-dev libxslt1-dev libgeoip-dev bison libyajl-dev curl libcurl4-openssl-dev libncurses5-dev libevent-dev libreadline-dev uuid-dev libbrotli-dev icu-devtools libicu-dev openssl libssl-dev -y
+    apt install build-essential tar unzip libgd3 libgd-dev git flex perl libonig-dev libsodium-dev libxml2-dev libxslt1-dev libgeoip-dev bison libyajl-dev curl libcurl4-openssl-dev libncurses5-dev libevent-dev libreadline-dev uuid-dev libbrotli-dev icu-devtools libicu-dev openssl libssl-dev -y
 else
     echo -e $HR
     echo "错误：耗子Linux面板不支持该系统"

scripts/php/install.sh

@@ -174,7 +174,7 @@ pm.min_spare_servers = 5
 pm.max_spare_servers = 10
 request_terminate_timeout = 100
 request_slowlog_timeout = 30
-pm.status_path = /phpfpm_${phpVersion}_status
+pm.status_path = /phpfpm_status/${phpVersion}
 slowlog = var/log/slow.log
 EOF
 

scripts/php_extensions/imagick.sh

@@ -18,6 +18,7 @@ limitations under the License.
 '
 
 HR="+----------------------------------------------------"
+OS=$(source /etc/os-release && { [[ "$ID" == "debian" ]] && echo "debian"; } || { [[ "$ID" == "centos" ]] || [[ "$ID" == "rhel" ]] || [[ "$ID" == "rocky" ]] || [[ "$ID" == "almalinux" ]] && echo "centos"; } || echo "unknown")
 
 downloadUrl="https://dl.cdn.haozi.net/panel/php_extensions"
 action="$1"
@@ -34,7 +35,15 @@ Install() {
     fi
 
     # 安装依赖
-    dnf install ImageMagick ImageMagick-devel -y
+    if [ "${OS}" == "centos" ]; then
+        dnf install ImageMagick ImageMagick-devel -y
+    elif [ "${OS}" == "debian" ]; then
+        apt install imagemagick libmagickwand-dev
+    else
+        echo -e $HR
+        echo "错误：耗子Linux面板不支持该系统"
+        exit 1
+    fi
 
     cd /www/server/php/${phpVersion}/src/ext
     rm -rf imagick