Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MariaDB OVH Mirror #2741

Merged
merged 6 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions provision/core/git/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-debian-bookworm.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-debian-bullseye.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-debian-buster.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-ubuntu-bionic.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions provision/core/mariadb/sources-ubuntu-focal.list
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-ubuntu-jammy.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions provision/core/mariadb/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions provision/core/nginx/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions provision/core/node-ppa/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions provision/core/php/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions provision/core/vvv/sources-ubuntu-noble.list
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions provision/provision-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down