Skip to content

Commit

Permalink
Merge pull request #2734 from Varying-Vagrant-Vagrants/modify/network…
Browse files Browse the repository at this point in the history
…-check-domains

Switch the domains used for network checks
  • Loading branch information
tomjn authored Sep 20, 2024
2 parents 0ce4b25 + e76de38 commit 53749e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down
11 changes: 6 additions & 5 deletions provision/provision-helpers.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# @description This file is for common helper functions that
# get called in other provisioners

Expand All @@ -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
Expand Down Expand Up @@ -67,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>${url}</url> with wget -q --spider --timeout=5 --tries=3 ${url}"
vvv_info " * Testing network connection to <url>${url}</url><info> with wget -q --spider --timeout=5 --tries=3 ${url}"

# Network Detection
#
Expand Down Expand Up @@ -101,8 +100,10 @@ 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
"http://ports.ubuntu.com/"
"https://nginx.org/packages/mainline/"
)
declare -a failed_hosts=()
for url in "${hosts_to_test[@]}"; do
Expand Down

0 comments on commit 53749e5

Please sign in to comment.