Merge pull request #2741 from Varying-Vagrant-Vagrants/modify/mariadb…

…-mirror-ovh MariaDB OVH Mirror
Varying-Vagrant-Vagrants · Oct 21, 2024 · dbd1071 · dbd1071
2 parents 2e2c436 + 123ce19
commit dbd1071
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ permalink: /docs/en-US/changelog/
 
 * 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 )
+* Switched from Starburst to OVH for MariaDB mirrors ( #2741 )
 * Fixes for service starts under some situations in Docker ( #2732 )
 * Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731)
 

diff --git a/provision/core/git/sources-ubuntu-noble.list b/provision/core/git/sources-ubuntu-noble.list
@@ -0,0 +1,3 @@
+# git lfs (large file storage plugin for git)
+deb https://packagecloud.io/github/git-lfs/ubuntu/ noble main
+deb-src https://packagecloud.io/github/git-lfs/ubuntu/ noble main
diff --git a/provision/core/mariadb/sources-debian-bookworm.list b/provision/core/mariadb/sources-debian-bookworm.list
@@ -2,5 +2,5 @@
 # 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main
diff --git a/provision/core/mariadb/sources-debian-bullseye.list b/provision/core/mariadb/sources-debian-bullseye.list
@@ -2,5 +2,5 @@
 # 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main
diff --git a/provision/core/mariadb/sources-debian-buster.list b/provision/core/mariadb/sources-debian-buster.list
@@ -2,5 +2,5 @@
 # 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 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main
diff --git a/provision/core/mariadb/sources-ubuntu-bionic.list b/provision/core/mariadb/sources-ubuntu-bionic.list
@@ -2,5 +2,5 @@
 # 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 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main
diff --git a/provision/core/mariadb/sources-ubuntu-focal.list b/provision/core/mariadb/sources-ubuntu-focal.list
@@ -1,6 +1,6 @@
-# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC
+# MariaDB 10.11 repository list - created 2024-10-19 19:33 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 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu focal main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu focal main
diff --git a/provision/core/mariadb/sources-ubuntu-jammy.list b/provision/core/mariadb/sources-ubuntu-jammy.list
@@ -2,5 +2,5 @@
 # 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 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu jammy main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu jammy main
diff --git a/provision/core/mariadb/sources-ubuntu-noble.list b/provision/core/mariadb/sources-ubuntu-noble.list
@@ -2,5 +2,5 @@
 # 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
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu noble main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu noble main
diff --git a/provision/core/nginx/sources-ubuntu-noble.list b/provision/core/nginx/sources-ubuntu-noble.list
@@ -0,0 +1,3 @@
+# Provides Nginx mainline
+deb https://nginx.org/packages/mainline/ubuntu/ noble nginx
+deb-src https://nginx.org/packages/mainline/ubuntu/ noble nginx
diff --git a/provision/core/node-ppa/sources-ubuntu-noble.list b/provision/core/node-ppa/sources-ubuntu-noble.list
@@ -0,0 +1,3 @@
+# Provides Node.js
+deb http://deb.nodesource.com/node_14.x noble main
+deb-src http://deb.nodesource.com/node_14.x noble main
diff --git a/provision/core/php/sources-ubuntu-noble.list b/provision/core/php/sources-ubuntu-noble.list
@@ -0,0 +1,3 @@
+# Provides PHP
+deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main
+deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main
diff --git a/provision/core/vvv/sources-ubuntu-noble.list b/provision/core/vvv/sources-ubuntu-noble.list
@@ -0,0 +1,3 @@
+# VVV mirror packages
+# deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu noble main
+# deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu noble main
diff --git a/provision/provision-helpers.sh b/provision/provision-helpers.sh
@@ -96,15 +96,15 @@ function network_check() {
   #
   # If you need to modify this list, contact us on GitHub with the changes.
   declare -a hosts_to_test=(
-    "https://ppa.launchpadcontent.net" # needed for core ubuntu packages
-    "https://wordpress.org" # WordPress!!
-    "https://github.com" # needed for dashboard, extensions, etc
-    "https://raw.githubusercontent.com" # some scripts and provisioners rely on this
-    "https://getcomposer.org" # composer is used for lots of sites and provisioners
-    "https://packagist.org" # Composer Packages
-    "https://mariadb.gb.ssimn.org" # MariaDB mirror
+    "https://ppa.launchpadcontent.net"     # Needed for core ubuntu packages
+    "https://wordpress.org"                # WordPress!!
+    "https://github.com"                   # Needed for dashboard, extensions, etc
+    "https://raw.githubusercontent.com"    # Some scripts and provisioners rely on this
+    "https://getcomposer.org"              # Composer is used for lots of sites and provisioners
+    "https://packagist.org"                # Composer Packages
+    "http://mariadb.mirrors.ovh.net"       # MariaDB mirror[ovh]
     "http://ports.ubuntu.com/"
-    "https://nginx.org/packages/mainline/"
+    "https://nginx.org/packages/mainline/" # Nginx
   )
   declare -a failed_hosts=()
   for url in "${hosts_to_test[@]}"; do