From f8022c81e94540267e5173afa59c8250c3b20838 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Thu, 19 Sep 2024 17:37:37 +0100 Subject: [PATCH 1/4] Switch the domains used for network checks to include packagist, replace mariadb mirror, and remove nodesource --- provision/provision-helpers.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/provision/provision-helpers.sh b/provision/provision-helpers.sh index 7bf1458a9..0a85dbc56 100755 --- a/provision/provision-helpers.sh +++ b/provision/provision-helpers.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # @description This file is for common helper functions that # get called in other provisioners @@ -19,7 +19,6 @@ export BLUE="\033[0;38;5;4m" # 33m" export PURPLE="\033[0;38;5;5m" # 129m" export CRESET="\033[0m" - VVV_CONFIG=/vagrant/vvv-custom.yml if [[ -f /vagrant/config.yml ]]; then VVV_CONFIG=/vagrant/config.yml @@ -101,8 +100,8 @@ function network_check() { "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://deb.nodesource.com" # Node JS installation - "https://mirror.rackspace.com" # MariaDB mirror + "https://packagist.org" # Composer Packages + "https://mariadb.gb.ssimn.org" # MariaDB mirror ) declare -a failed_hosts=() for url in "${hosts_to_test[@]}"; do From 6bd16cc77d886768921a24c789730325c632d2e7 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Thu, 19 Sep 2024 17:41:07 +0100 Subject: [PATCH 2/4] add ubuntu and nginx domains to the network check script --- provision/provision-helpers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/provision/provision-helpers.sh b/provision/provision-helpers.sh index 0a85dbc56..ff1274e33 100755 --- a/provision/provision-helpers.sh +++ b/provision/provision-helpers.sh @@ -102,6 +102,8 @@ 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://ports.ubuntu.com/" + "https://nginx.org/packages/mainline/" ) declare -a failed_hosts=() for url in "${hosts_to_test[@]}"; do From f1a00910bfc80a61113c536efb34fc549d9bfbd5 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Thu, 19 Sep 2024 17:45:43 +0100 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67549fc49..769588c9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ permalink: /docs/en-US/changelog/ ### Maintenance * Removed commented out subversion config lines that were flagged as a false positive security issue ( #2725 ) +* Adjusted the domains used in the network check to remove unused domains and add some that are used ( #2734 ) ## 3.13.2 ( 2024 July 19th ) From e76de38ef4f67126ba4a638628b55b3a885ff311 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Fri, 20 Sep 2024 10:23:00 +0100 Subject: [PATCH 4/4] fix the colour of the network check info --- provision/provision-helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/provision-helpers.sh b/provision/provision-helpers.sh index ff1274e33..775b518a4 100755 --- a/provision/provision-helpers.sh +++ b/provision/provision-helpers.sh @@ -66,7 +66,7 @@ export -f network_detection # @exitcode 1 If network issues are found function check_network_connection_to_host() { local url=${1:-"http://ppa.launchpadcontent.net"} - vvv_info " * Testing network connection to ${url} with wget -q --spider --timeout=5 --tries=3 ${url}" + vvv_info " * Testing network connection to ${url} with wget -q --spider --timeout=5 --tries=3 ${url}" # Network Detection #