Pārlūkot izejas kodu

Upgrade to MariaDB 10.11 (#3305)

* Update hst-install-debian.sh

* Update hst-install-ubuntu.sh

* Update upgrade_mariadb.sh

* Enable again MariaDB repo for 22.04
Jaap Marcus 3 gadi atpakaļ
vecāks
revīzija
36c7451d9f

+ 1 - 1
install/hst-install-debian.sh

@@ -36,7 +36,7 @@ HESTIA_INSTALL_VER='1.7.0~alpha'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.0"
-mariadb_v="10.6"
+mariadb_v="10.11"
 
 software="nginx apache2 apache2-utils apache2-suexec-custom
   apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php$fpm_v

+ 2 - 6
install/hst-install-ubuntu.sh

@@ -36,7 +36,7 @@ HESTIA_INSTALL_VER='1.7.0~alpha'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.0"
-mariadb_v="10.6"
+mariadb_v="10.11"
 
 # Defining software pack for all distros
 software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
@@ -713,11 +713,7 @@ fi
 # Installing MariaDB repo
 if [ "$mysql" = 'yes' ]; then
 	echo "[ * ] MariaDB"
-	if [ "$release" != '22.04' ]; then
-		echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
-	else
-		echo "#deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
-	fi
+	echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
 	curl -s https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor | tee /usr/share/keyrings/mariadb-keyring.gpg > /dev/null 2>&1
 fi
 

+ 1 - 1
install/upgrade/manual/upgrade_mariadb.sh

@@ -7,7 +7,7 @@
 #----------------------------------------------------------#
 
 # Set MariaDB Target Version
-mariadb_v='10.6'
+mariadb_v='10.11'
 
 # Load OS informations
 source /etc/os-release