Browse Source

feat: del MariaDB-10.6 and add MariaDB-10.11

lj2007331@gmail.com 1 year ago
parent
commit
6506adb53e

+ 1 - 1
README.md

@@ -6,7 +6,7 @@ Script properties:
 - Continually updated, Provide Shell Interaction and Autoinstall
 - Source compiler installation, most stable source is the latest version, and download from the official site
 - Some security optimization
-- Providing a plurality of database versions (MySQL-8.0, MySQL-5.7, MySQL-5.6, MySQL-5.5, MariaDB-10.5, MariaDB-10.4, MariaDB-10.3, MariaDB-5.5, Percona-8.0, Percona-5.7, Percona-5.6, Percona-5.5, PostgreSQL, MongoDB)
+- Providing a plurality of database versions (MySQL-8.0, MySQL-5.7, MySQL-5.6, MySQL-5.5, MariaDB-10.11, MariaDB-10.5, MariaDB-10.4, MariaDB-5.5, Percona-8.0, Percona-5.7, Percona-5.6, Percona-5.5, PostgreSQL, MongoDB)
 - Providing multiple PHP versions (PHP-8.2, PHP-8.1, PHP-8.0, PHP-7.4, PHP-7.3, PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
 - Provide Nginx, Tengine, OpenResty, Apache and ngx_lua_waf
 - Providing a plurality of Tomcat version (Tomcat-10, Tomcat-9, Tomcat-8, Tomcat-7)

+ 1 - 1
include/check_download.sh

@@ -250,7 +250,7 @@ checkDownload() {
       [5-8])
 	case "${db_option}" in
           5)
-            mariadb_ver=${mariadb106_ver}
+            mariadb_ver=${mariadb1011_ver}
 	    ;;
           6)
             mariadb_ver=${mariadb105_ver}

+ 1 - 1
include/check_sw.sh

@@ -85,7 +85,7 @@ installDepsRHEL() {
     yum -y groupremove "Basic Web Server" "MySQL Database server" "MySQL Database client"
   fi
 
-  [ "${RHEL_ver}" == '9' ] && [ ! -e "/usr/lib64/libtinfo.so.5" ] && ln -s /usr/lib64/libtinfo.so.6.1 /usr/lib64/libtinfo.so.5
+  [ "${RHEL_ver}" == '9' ] && [ ! -e "/usr/lib64/libtinfo.so.5" ] && ln -s /usr/lib64/libtinfo.so.6 /usr/lib64/libtinfo.so.5
 
   echo "${CMSG}Installing dependencies packages...${CEND}"
   # Install needed packages

+ 9 - 9
include/mariadb-10.6.sh → include/mariadb-10.11.sh

@@ -8,24 +8,24 @@
 #       https://oneinstack.com
 #       https://github.com/oneinstack/oneinstack
 
-Install_MariaDB106() {
+Install_MariaDB1011() {
   pushd ${oneinstack_dir}/src > /dev/null
   id -u mysql >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mariadb_install_dir}" ] && mkdir -p ${mariadb_install_dir}
-  mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
+  mkdir -p ${mariadb_data_dir};chown mysql:mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
-    tar zxf mariadb-${mariadb106_ver}-linux-systemd-x86_64.tar.gz
-    mv mariadb-${mariadb106_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
+    tar zxf mariadb-${mariadb1011_ver}-linux-systemd-x86_64.tar.gz
+    mv mariadb-${mariadb1011_ver}-linux-systemd-x86_64/* ${mariadb_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
     sed -i "s@/usr/local/mysql@${mariadb_install_dir}@g" ${mariadb_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
     boostVersion2=$(echo ${boost_oldver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
-    tar xzf mariadb-${mariadb106_ver}.tar.gz
-    pushd mariadb-${mariadb106_ver}
+    tar xzf mariadb-${mariadb1011_ver}.tar.gz
+    pushd mariadb-${mariadb1011_ver}
     cmake . -DCMAKE_INSTALL_PREFIX=${mariadb_install_dir} \
     -DMYSQL_DATADIR=${mariadb_data_dir} \
     -DDOWNLOAD_BOOST=1 \
@@ -52,9 +52,9 @@ Install_MariaDB106() {
     sed -i "s+^dbrootpwd.*+dbrootpwd='${dbrootpwd}'+" ../options.conf
     echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
     if [ "${dbinstallmethod}" == "1" ]; then
-      rm -rf mariadb-${mariadb106_ver}-linux-systemd-x86_64
+      rm -rf mariadb-${mariadb1011_ver}-linux-systemd-x86_64
     elif [ "${dbinstallmethod}" == "2" ]; then
-      rm -rf mariadb-${mariadb106_ver} boost_${boostVersion2}
+      rm -rf mariadb-${mariadb1011_ver} boost_${boostVersion2}
     fi
   else
     rm -rf ${mariadb_install_dir}
@@ -194,7 +194,7 @@ EOF
   ${mariadb_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mariadb_install_dir} --datadir=${mariadb_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mariadb_data_dir}
+  chown mysql:mysql -R ${mariadb_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mariadb_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mariadb-10.4.sh

@@ -14,7 +14,7 @@ Install_MariaDB104() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mariadb_install_dir}" ] && mkdir -p ${mariadb_install_dir}
-  mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
+  mkdir -p ${mariadb_data_dir};chown mysql:mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar zxf mariadb-${mariadb104_ver}-linux-systemd-x86_64.tar.gz
@@ -196,7 +196,7 @@ EOF
   ${mariadb_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mariadb_install_dir} --datadir=${mariadb_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mariadb_data_dir}
+  chown mysql:mysql -R ${mariadb_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mariadb_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mariadb-10.5.sh

@@ -14,7 +14,7 @@ Install_MariaDB105() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mariadb_install_dir}" ] && mkdir -p ${mariadb_install_dir}
-  mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
+  mkdir -p ${mariadb_data_dir};chown mysql:mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar zxf mariadb-${mariadb105_ver}-linux-systemd-x86_64.tar.gz
@@ -194,7 +194,7 @@ EOF
   ${mariadb_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mariadb_install_dir} --datadir=${mariadb_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mariadb_data_dir}
+  chown mysql:mysql -R ${mariadb_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mariadb_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mariadb-5.5.sh

@@ -14,7 +14,7 @@ Install_MariaDB55() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mariadb_install_dir}" ] && mkdir -p ${mariadb_install_dir}
-  mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
+  mkdir -p ${mariadb_data_dir};chown mysql:mysql -R ${mariadb_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar zxf mariadb-${mariadb55_ver}-linux-systemd-x86_64.tar.gz
@@ -195,7 +195,7 @@ EOF
   ${mariadb_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mariadb_install_dir} --datadir=${mariadb_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mariadb_data_dir}
+  chown mysql:mysql -R ${mariadb_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mariadb_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mysql-5.5.sh

@@ -14,7 +14,7 @@ Install_MySQL55() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mysql_install_dir}" ] && mkdir -p ${mysql_install_dir}
-  mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
+  mkdir -p ${mysql_data_dir};chown mysql:mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xzf mysql-${mysql55_ver}-linux-glibc2.12-x86_64.tar.gz
@@ -198,7 +198,7 @@ EOF
   ${mysql_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mysql_install_dir} --datadir=${mysql_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mysql_data_dir}
+  chown mysql:mysql -R ${mysql_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mysql_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mysql-5.6.sh

@@ -14,7 +14,7 @@ Install_MySQL56() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mysql_install_dir}" ] && mkdir -p ${mysql_install_dir}
-  mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
+  mkdir -p ${mysql_data_dir};chown mysql:mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xzf mysql-${mysql56_ver}-linux-glibc2.12-x86_64.tar.gz
@@ -197,7 +197,7 @@ EOF
   ${mysql_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mysql_install_dir} --datadir=${mysql_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mysql_data_dir}
+  chown mysql:mysql -R ${mysql_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mysql_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mysql-5.7.sh

@@ -14,7 +14,7 @@ Install_MySQL57() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mysql_install_dir}" ] && mkdir -p ${mysql_install_dir}
-  mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
+  mkdir -p ${mysql_data_dir};chown mysql:mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xzf mysql-${mysql57_ver}-linux-glibc2.12-x86_64.tar.gz
@@ -201,7 +201,7 @@ EOF
   ${mysql_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${mysql_install_dir} --datadir=${mysql_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mysql_data_dir}
+  chown mysql:mysql -R ${mysql_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mysql_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/mysql-8.0.sh

@@ -14,7 +14,7 @@ Install_MySQL80() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${mysql_install_dir}" ] && mkdir -p ${mysql_install_dir}
-  mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
+  mkdir -p ${mysql_data_dir};chown mysql:mysql -R ${mysql_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xJf mysql-${mysql80_ver}-linux-glibc2.12-x86_64.tar.xz
@@ -200,7 +200,7 @@ EOF
   ${mysql_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${mysql_install_dir} --datadir=${mysql_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${mysql_data_dir}
+  chown mysql:mysql -R ${mysql_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${mysql_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/percona-5.5.sh

@@ -14,7 +14,7 @@ Install_Percona55() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${percona_install_dir}" ] && mkdir -p ${percona_install_dir}
-  mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
+  mkdir -p ${percona_data_dir};chown mysql:mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona55_ver} | sed "s@-@-rel@")
@@ -199,7 +199,7 @@ EOF
   ${percona_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${percona_install_dir} --datadir=${percona_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${percona_data_dir}
+  chown mysql:mysql -R ${percona_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${percona_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/percona-5.6.sh

@@ -14,7 +14,7 @@ Install_Percona56() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${percona_install_dir}" ] && mkdir -p ${percona_install_dir}
-  mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
+  mkdir -p ${percona_data_dir};chown mysql:mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     perconaVerStr1=$(echo ${percona56_ver} | sed "s@-@-rel@")
@@ -199,7 +199,7 @@ EOF
   ${percona_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${percona_install_dir} --datadir=${percona_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${percona_data_dir}
+  chown mysql:mysql -R ${percona_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${percona_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/percona-5.7.sh

@@ -14,7 +14,7 @@ Install_Percona57() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${percona_install_dir}" ] && mkdir -p ${percona_install_dir}
-  mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
+  mkdir -p ${percona_data_dir};chown mysql:mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xzf Percona-Server-${percona57_ver}-Linux.x86_64.glibc2.17.tar.gz
@@ -202,7 +202,7 @@ EOF
   ${percona_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${percona_install_dir} --datadir=${percona_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${percona_data_dir}
+  chown mysql:mysql -R ${percona_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${percona_install_dir}/bin:\$PATH" >> /etc/profile

+ 2 - 2
include/percona-8.0.sh

@@ -14,7 +14,7 @@ Install_Percona80() {
   [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
   [ ! -d "${percona_install_dir}" ] && mkdir -p ${percona_install_dir}
-  mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
+  mkdir -p ${percona_data_dir};chown mysql:mysql -R ${percona_data_dir}
 
   if [ "${dbinstallmethod}" == "1" ]; then
     tar xzf ./Percona-Server-${percona80_ver}-Linux.x86_64.glibc2.28.tar.gz
@@ -201,7 +201,7 @@ EOF
   ${percona_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${percona_install_dir} --datadir=${percona_data_dir}
 
   [ "${Wsl}" == true ] && chmod 600 /etc/my.cnf
-  chown mysql.mysql -R ${percona_data_dir}
+  chown mysql:mysql -R ${percona_data_dir}
   [ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
   service mysqld start
   [ -z "$(grep ^'export PATH=' /etc/profile)" ] && echo "export PATH=${percona_install_dir}/bin:\$PATH" >> /etc/profile

+ 6 - 6
include/upgrade_db.sh

@@ -109,11 +109,11 @@ Upgrade_DB() {
       mv ${mariadb_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${mariadb_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       [ ! -d "${mariadb_install_dir}" ] && mkdir -p ${mariadb_install_dir}
-      mkdir -p ${mariadb_data_dir};chown mysql.mysql -R ${mariadb_data_dir}
+      mkdir -p ${mariadb_data_dir};chown mysql:mysql -R ${mariadb_data_dir}
       mv ${DB_filename}/* ${mariadb_install_dir}/
       sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mariadb_install_dir}/bin/mysqld_safe
       ${mariadb_install_dir}/scripts/mysql_install_db --user=mysql --basedir=${mariadb_install_dir} --datadir=${mariadb_data_dir}
-      chown mysql.mysql -R ${mariadb_data_dir}
+      chown mysql:mysql -R ${mariadb_data_dir}
       service mysqld start
       ${mariadb_install_dir}/bin/mysql < DB_all_backup_$(date +"%Y%m%d").sql
       service mysqld restart
@@ -127,7 +127,7 @@ Upgrade_DB() {
       mv ${percona_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${percona_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       [ ! -d "${percona_install_dir}" ] && mkdir -p ${percona_install_dir}
-      mkdir -p ${percona_data_dir};chown mysql.mysql -R ${percona_data_dir}
+      mkdir -p ${percona_data_dir};chown mysql:mysql -R ${percona_data_dir}
       mv ${DB_filename}/* ${percona_install_dir}/
       sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
       sed -i "s@/usr/local/${DB_filename}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
@@ -136,7 +136,7 @@ Upgrade_DB() {
       else
         ${percona_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${percona_install_dir} --datadir=${percona_data_dir}
       fi
-      chown mysql.mysql -R ${percona_data_dir}
+      chown mysql:mysql -R ${percona_data_dir}
       service mysqld start
       ${percona_install_dir}/bin/mysql < DB_all_backup_$(date +"%Y%m%d").sql
       service mysqld restart
@@ -154,7 +154,7 @@ Upgrade_DB() {
       mv ${mysql_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       mv ${mysql_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
       [ ! -d "${mysql_install_dir}" ] && mkdir -p ${mysql_install_dir}
-      mkdir -p ${mysql_data_dir};chown mysql.mysql -R ${mysql_data_dir}
+      mkdir -p ${mysql_data_dir};chown mysql:mysql -R ${mysql_data_dir}
       mv ${DB_filename}/* ${mysql_install_dir}/
       sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
       sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
@@ -164,7 +164,7 @@ Upgrade_DB() {
         ${mysql_install_dir}/bin/mysqld --initialize-insecure --user=mysql --basedir=${mysql_install_dir} --datadir=${mysql_data_dir}
       fi
 
-      chown mysql.mysql -R ${mysql_data_dir}
+      chown mysql:mysql -R ${mysql_data_dir}
       [ -e "${mysql_install_dir}/my.cnf" ] && rm -rf ${mysql_install_dir}/my.cnf
       sed -i '/myisam_repair_threads/d' /etc/my.cnf
       service mysqld start

+ 3 - 3
install.sh

@@ -385,7 +385,7 @@ if [ ${ARG_NUM} == 0 ]; then
           echo -e "\t${CMSG} 2${CEND}. Install MySQL-5.7"
           echo -e "\t${CMSG} 3${CEND}. Install MySQL-5.6"
           echo -e "\t${CMSG} 4${CEND}. Install MySQL-5.5"
-          echo -e "\t${CMSG} 5${CEND}. Install MariaDB-10.6"
+          echo -e "\t${CMSG} 5${CEND}. Install MariaDB-10.11"
           echo -e "\t${CMSG} 6${CEND}. Install MariaDB-10.5"
           echo -e "\t${CMSG} 7${CEND}. Install MariaDB-10.4"
           echo -e "\t${CMSG} 8${CEND}. Install MariaDB-5.5"
@@ -787,8 +787,8 @@ case "${db_option}" in
     Install_MySQL55 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   5)
-    . include/mariadb-10.6.sh
-    Install_MariaDB106 2>&1 | tee -a ${oneinstack_dir}/install.log
+    . include/mariadb-10.11.sh
+    Install_MariaDB1011 2>&1 | tee -a ${oneinstack_dir}/install.log
     ;;
   6)
     . include/mariadb-10.5.sh

+ 6 - 6
versions.txt

@@ -23,9 +23,9 @@ mysql57_ver=5.7.42
 mysql56_ver=5.6.51
 mysql55_ver=5.5.62
 
-mariadb106_ver=10.6.13
-mariadb105_ver=10.5.20
-mariadb104_ver=10.4.29
+mariadb1011_ver=10.11.4
+mariadb105_ver=10.5.21
+mariadb104_ver=10.4.30
 mariadb55_ver=5.5.68
 
 percona80_ver=8.0.32-24
@@ -47,7 +47,7 @@ php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
 php74_ver=7.4.33
-php80_ver=8.0.28
+php80_ver=8.0.29
 php81_ver=8.1.20
 php82_ver=8.2.7
 
@@ -64,7 +64,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.1-11
+imagemagick_ver=7.1.1-12
 imagick_ver=3.7.0
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.40
@@ -94,7 +94,7 @@ pecl_redis_ver=5.3.7
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.20
+memcached_ver=1.6.21
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.2.0
 pecl_memcached_oldver=2.2.0