Merge pull request #2728 from Varying-Vagrant-Vagrants/change-mariadb…

…-from-rackspace

Upgrade MariaDB to 10.11 and switch mirror from rackspace

CHANGELOG.md

@@ -8,9 +8,14 @@ permalink: /docs/en-US/changelog/
 
 ## 3.14 ( 2024 ETA )
 
+### Enhancements
+
+* Upgraded MariaDB from 10.5 to 10.11 ( #2728 )
+
 ### Bug Fixes
 
 * VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )
+* Switched from Rackspace to Starburst services for MariaDB mirrors ( #2728 )
 
 ## 3.13.2 ( 2024 July 19th )
 

provision/core/mariadb/provision.sh

@@ -8,8 +8,8 @@ function mariadb_before_packages() {
   # Use debconf-set-selections to specify the default password for the root MariaDB
   # account. This runs on every provision, even if MariaDB has been installed. If
   # MariaDB is already installed, it will not affect anything.
-  echo mariadb-server-10.5 mysql-server/root_password password "root" | debconf-set-selections
-  echo mariadb-server-10.5 mysql-server/root_password_again password "root" | debconf-set-selections
+  echo mariadb-server-10.11 mysql-server/root_password password "root" | debconf-set-selections
+  echo mariadb-server-10.11 mysql-server/root_password_again password "root" | debconf-set-selections
 
   vvv_info " * Setting up MySQL configuration file links..."
 
@@ -38,18 +38,24 @@ vvv_add_hook before_packages mariadb_before_packages
 
 function mariadb_register_apt_keys() {
   if ! vvv_apt_keys_has 'MariaDB'; then
-    # Apply the MariaDB signing keyg
+    # Apply the MariaDB signing key
     vvv_info " * Applying the MariaDB signing key..."
     apt-key add /srv/provision/core/mariadb/apt-keys/mariadb.key
   fi
+  mkdir -p /etc/apt/keyrings
+  cp -f "/srv/provision/core/mariadb/apt-keys/mariadb_release_signing_key.pgp" /etc/apt/keyrings/mariadb-keyring.pgp
 }
 vvv_add_hook register_apt_keys mariadb_register_apt_keys
 
 function mariadb_register_apt_sources() {
   vvv_info " * installing MariaDB apt sources"
-  local OSID=$(lsb_release --id --short)
-  local OSCODENAME=$(lsb_release --codename --short)
-  local APTSOURCE="/srv/provision/core/mariadb/sources-${OSID,,}-${OSCODENAME,,}.list"
+  local OSID
+  local OSCODENAME
+  local APTSOURCE
+
+  OSID=$(lsb_release --id --short)
+  OSCODENAME=$(lsb_release --codename --short)
+  APTSOURCE="/srv/provision/core/mariadb/sources-${OSID,,}-${OSCODENAME,,}.list"
   if [ -f "${APTSOURCE}" ]; then
     cp -f "${APTSOURCE}" "/etc/apt/sources.list.d/vvv-mariadb-sources.list"
   else

provision/core/mariadb/sources-debian-bookworm.list

@@ -0,0 +1,6 @@
+# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC
+# https://mariadb.org/download/
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bookworm main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main

provision/core/mariadb/sources-debian-bullseye.list

@@ -0,0 +1,6 @@
+# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC
+# https://mariadb.org/download/
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bullseye main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main

provision/core/mariadb/sources-debian-buster.list

@@ -1,4 +1,6 @@
-# MariaDB 10.5 repository list - created 2021-11-14 10:28 UTC
+# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC
 # https://mariadb.org/download/
-deb [arch=amd64,arm64,ppc64el] https://mirror.rackspace.com/mariadb/repo/10.5/debian buster main
-deb-src https://mirror.rackspace.com/mariadb/repo/10.5/debian buster main
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian buster main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main

provision/core/mariadb/sources-ubuntu-bionic.list

@@ -1,4 +1,6 @@
-# MariaDB 10.5 repository list - created  UTC
+# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC
 # https://mariadb.org/download/
-deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu bionic main
-deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu bionic main
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu bionic main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main

provision/core/mariadb/sources-ubuntu-focal.list

@@ -1,4 +1,6 @@
-# MariaDB 10.5 repository list - created  UTC
+# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC
 # https://mariadb.org/download/
-deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu focal main
-deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu focal main
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu focal main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main

provision/core/mariadb/sources-ubuntu-jammy.list

@@ -1,4 +1,6 @@
-# MariaDB 10.5 repository list - created  UTC
+# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC
 # https://mariadb.org/download/
-deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main
-deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu jammy main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main

provision/core/mariadb/sources-ubuntu-noble.list

@@ -0,0 +1,6 @@
+# MariaDB 10.11 repository list - created 2024-08-27 19:48 UTC
+# https://mariadb.org/download/
+# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
+# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu noble main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main

provision/core/vvv/provision.sh

@@ -16,6 +16,7 @@ function vvv_register_packages() {
     software-properties-common
     ca-certificates
     libgnutls30
+    apt-transport-https
 
     # Daily automatic security package upgrades
     unattended-upgrades