Skip to content

Commit d224835

Browse files
pentatonicfunkpentatonicfunk
committed
Merge remote-tracking branch 'upstream/develop' into docker-provider-beta
# Conflicts: # provision/provision-helpers.sh
2 parents 196887e + dbd1071 commit d224835

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ permalink: /docs/en-US/changelog/
2020

2121
* VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )
2222
* Switched from Rackspace to Starburst services for MariaDB mirrors ( #2728 )
23+
* Switched from Starburst to OVH for MariaDB mirrors ( #2741 )
2324
* Fixes for service starts under some situations in Docker ( #2732 )
2425
* Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731)
2526

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bookworm main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bullseye main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian buster main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu bionic main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu jammy main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu jammy main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu jammy main

‎provision/provision-helpers.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,15 @@ function network_check() {
9696
#
9797
# If you need to modify this list, contact us on GitHub with the changes.
9898
declare -a hosts_to_test=(
99-
"https://ppa.launchpadcontent.net" # needed for core ubuntu packages
100-
"https://wordpress.org" # WordPress!!
101-
"https://github.com" # needed for dashboard, extensions, etc
102-
"https://raw.githubusercontent.com" # some scripts and provisioners rely on this
103-
"https://getcomposer.org" # composer is used for lots of sites and provisioners
104-
"https://packagist.org" # Composer Packages
105-
"https://mariadb.gb.ssimn.org" # MariaDB mirror
106-
"http://mariadb.mirrors.ovh.net" # MariaDB mirror[ovh]
99+
"https://ppa.launchpadcontent.net" # Needed for core ubuntu packages
100+
"https://wordpress.org" # WordPress!!
101+
"https://github.com" # Needed for dashboard, extensions, etc
102+
"https://raw.githubusercontent.com" # Some scripts and provisioners rely on this
103+
"https://getcomposer.org" # Composer is used for lots of sites and provisioners
104+
"https://packagist.org" # Composer Packages
105+
"http://mariadb.mirrors.ovh.net" # MariaDB mirror[ovh]
107106
"http://ports.ubuntu.com/"
108-
"https://nginx.org/packages/mainline/"
107+
"https://nginx.org/packages/mainline/" # Nginx
109108
)
110109
declare -a failed_hosts=()
111110
for url in "${hosts_to_test[@]}"; do

0 commit comments

Comments
 (0)