Skip to content

Commit 36c7451

Browse files
authored
Upgrade to MariaDB 10.11 (hestiacp#3305)
* Update hst-install-debian.sh * Update hst-install-ubuntu.sh * Update upgrade_mariadb.sh * Enable again MariaDB repo for 22.04
1 parent 6aaa5a1 commit 36c7451

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ HESTIA_INSTALL_VER='1.7.0~alpha'
3636
# Dependencies
3737
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
3838
fpm_v="8.0"
39-
mariadb_v="10.6"
39+
mariadb_v="10.11"
4040

4141
software="nginx apache2 apache2-utils apache2-suexec-custom
4242
apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php$fpm_v

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ HESTIA_INSTALL_VER='1.7.0~alpha'
3636
# Dependencies
3737
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
3838
fpm_v="8.0"
39-
mariadb_v="10.6"
39+
mariadb_v="10.11"
4040

4141
# Defining software pack for all distros
4242
software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
@@ -713,11 +713,7 @@ fi
713713
# Installing MariaDB repo
714714
if [ "$mysql" = 'yes' ]; then
715715
echo "[ * ] MariaDB"
716-
if [ "$release" != '22.04' ]; then
717-
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
718-
else
719-
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
720-
fi
716+
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
721717
curl -s https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor | tee /usr/share/keyrings/mariadb-keyring.gpg > /dev/null 2>&1
722718
fi
723719

install/upgrade/manual/upgrade_mariadb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#----------------------------------------------------------#
88

99
# Set MariaDB Target Version
10-
mariadb_v='10.6'
10+
mariadb_v='10.11'
1111

1212
# Load OS informations
1313
source /etc/os-release

0 commit comments

Comments
 (0)