From da7ffa32388e296b2054b560bbfd2a54058ce37e Mon Sep 17 00:00:00 2001 From: Hendrawan Kuncoro Date: Sun, 20 Oct 2024 02:36:25 +0700 Subject: [PATCH 1/6] Update mariadb repo to OVH for ubuntu focal - Add OVH url in hosts_to_test ( keep the mariadb.gb.ssimn.org ) --- provision/core/mariadb/sources-ubuntu-focal.list | 6 +++--- provision/provision-helpers.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/provision/core/mariadb/sources-ubuntu-focal.list b/provision/core/mariadb/sources-ubuntu-focal.list index a8bf3ac60..aaf4c2246 100644 --- 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/provision-helpers.sh b/provision/provision-helpers.sh index a7e0166f6..5a6e7beeb 100755 --- a/provision/provision-helpers.sh +++ b/provision/provision-helpers.sh @@ -103,6 +103,7 @@ function network_check() { "https://getcomposer.org" # composer is used for lots of sites and provisioners "https://packagist.org" # Composer Packages "https://mariadb.gb.ssimn.org" # MariaDB mirror + "http://mariadb.mirrors.ovh.net" # MariaDB mirror[ovh] "http://ports.ubuntu.com/" "https://nginx.org/packages/mainline/" ) From a2b6affb510ab5821c344239b7749e4e18dcaf03 Mon Sep 17 00:00:00 2001 From: Hendrawan Kuncoro Date: Sun, 20 Oct 2024 05:11:32 +0700 Subject: [PATCH 2/6] Attempt to add more Ubuntu noble repo list --- provision/core/git/sources-ubuntu-noble.list | 3 +++ provision/core/mariadb/sources-ubuntu-noble.list | 4 ++-- provision/core/nginx/sources-ubuntu-noble.list | 3 +++ provision/core/node-ppa/sources-ubuntu-noble.list | 3 +++ provision/core/php/sources-ubuntu-noble.list | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 provision/core/git/sources-ubuntu-noble.list create mode 100644 provision/core/nginx/sources-ubuntu-noble.list create mode 100644 provision/core/node-ppa/sources-ubuntu-noble.list create mode 100644 provision/core/php/sources-ubuntu-noble.list diff --git a/provision/core/git/sources-ubuntu-noble.list b/provision/core/git/sources-ubuntu-noble.list new file mode 100644 index 000000000..e843c2a2a --- /dev/null +++ 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-ubuntu-noble.list b/provision/core/mariadb/sources-ubuntu-noble.list index ae026623b..80cee575e 100644 --- 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 new file mode 100644 index 000000000..fe30be8cf --- /dev/null +++ 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 new file mode 100644 index 000000000..4584b4fe0 --- /dev/null +++ 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 new file mode 100644 index 000000000..579627921 --- /dev/null +++ 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 From 84b6316432e6eb194c5a1fe98da2d818ceca6a86 Mon Sep 17 00:00:00 2001 From: Hendrawan Kuncoro Date: Sun, 20 Oct 2024 05:24:43 +0700 Subject: [PATCH 3/6] Dummy vvv sources list for noble --- provision/core/vvv/sources-ubuntu-noble.list | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 provision/core/vvv/sources-ubuntu-noble.list diff --git a/provision/core/vvv/sources-ubuntu-noble.list b/provision/core/vvv/sources-ubuntu-noble.list new file mode 100644 index 000000000..93133ed1e --- /dev/null +++ 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 From 95f7e9f04a153286ed99c0f4c4589e0c1aa7005a Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 20 Oct 2024 16:08:26 +0100 Subject: [PATCH 4/6] Eliminate old mariadb mirror --- provision/core/mariadb/sources-debian-bookworm.list | 4 ++-- provision/core/mariadb/sources-debian-bullseye.list | 4 ++-- provision/core/mariadb/sources-debian-buster.list | 4 ++-- provision/core/mariadb/sources-ubuntu-bionic.list | 4 ++-- provision/core/mariadb/sources-ubuntu-jammy.list | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/provision/core/mariadb/sources-debian-bookworm.list b/provision/core/mariadb/sources-debian-bookworm.list index ae454453b..048c70f80 100644 --- 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 index 13496b13f..a5d03dd53 100644 --- 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 index ee7118c20..f91683f97 100644 --- 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 index 283e4f30c..5ff780d2f 100644 --- 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-jammy.list b/provision/core/mariadb/sources-ubuntu-jammy.list index 4e1c521b4..a8f15a2bc 100644 --- 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 From be11c79af4063f41f3b90238cc6e51b021f0eea7 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 20 Oct 2024 16:08:47 +0100 Subject: [PATCH 5/6] remove ssimn.org mirror from network chcks and reformat array --- provision/provision-helpers.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/provision/provision-helpers.sh b/provision/provision-helpers.sh index 5a6e7beeb..3a72490a3 100755 --- a/provision/provision-helpers.sh +++ b/provision/provision-helpers.sh @@ -96,16 +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 - "http://mariadb.mirrors.ovh.net" # MariaDB mirror[ovh] + "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 From 123ce1902482058e492a1f5afd70aeaae2083932 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 20 Oct 2024 16:10:45 +0100 Subject: [PATCH 6/6] Add OVH mariadb mirror change to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6d302e78..cbb526477 100644 --- 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)