Просмотр исходного кода

Upgrade installer + Manual upgrade 10.4 to 10.5 (#1219)

* Upgrade installer + Manual upgrade 10.4 to 10.5

* Update CHANGELOG.md
Jaap Marcus 5 лет назад
Родитель
Сommit
61e59adb2a

+ 1 - 0
CHANGELOG.md

@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 - Add support Proftpd TLS Support
 - Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email
 - Updated translations system with the use of Gettext. Modified / Updated all translated strings
+- Updated MariaDB to 10.5 (Manual upgrade required install/upgrade/manual/upgrade_mariadb.sh)
 
 ## Bugfixes
 - Removed root login (root / root password )

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

@@ -27,7 +27,7 @@ HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 fpm_v="7.3"
-mariadb_v="10.4"
+mariadb_v="10.5"
 
 if [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom

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

@@ -27,7 +27,7 @@ HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 fpm_v="7.3"
-mariadb_v="10.4"
+mariadb_v="10.5"
 
 # Defining software pack for all distros
 software="apache2 apache2.2-common apache2-suexec-custom apache2-utils

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

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# This script validates and upgrades the MariaDB version to 10.4
+# This script validates and upgrades the MariaDB version to 10.5
 
 # Set MariaDB Target Version
-mariadb_v='10.4'
+mariadb_v='10.5'
 
 # Load OS informations
 source /etc/os-release
@@ -31,10 +31,10 @@ fi
 echo "Add new MariaDB repository..."
 apt="/etc/apt/sources.list.d/"
 if [ "$id" = "ubuntu" ]; then
-    echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
+    echo "deb [arch=amd64] https://mirror.mva-n.net/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
     APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 > /dev/null 2>&1
 else
-    echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
+    echo "deb [arch=amd64] https://mirror.mva-n.net/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
     if [ "$id" = "jessie" ]; then
         APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com CBCB082A1BB943DB > /dev/null 2>&1
     else