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.

Sign up for GitHub

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

Switch to the newer launchpad PPA domain with HTTPS #2607

Merged
merged 2 commits into from
May 14, 2022
Merged

Switch to the newer launchpad PPA domain with HTTPS #2607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca689d
switch to the newer launchpad PPA domain with HTTPS
tomjn May 13, 2022
3b8dde7
update changelog
tomjn May 13, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ permalink: /docs/en-US/changelog/

* Improved provisioning output
* VVV will now attempt to test Nginx configs on installation and recover ( #2604 )
* Switched to new launchpad PPA domains with HTTPS ( #2586 )

### Bug Fixes

Expand Down
4 changes: 2 additions & 2 deletions provision/core/php/sources-ubuntu-bionic.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Provides PHP
deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main
deb-src http://ppa.launchpad.net/ondrej/php/ubuntu bionic main
deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu bionic main
deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu bionic main
4 changes: 2 additions & 2 deletions provision/core/php/sources-ubuntu-focal.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Provides PHP
deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main
deb-src http://ppa.launchpad.net/ondrej/php/ubuntu focal main
deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu focal main
deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu focal main
4 changes: 2 additions & 2 deletions provision/core/vvv/sources-ubuntu-bionic.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# VVV mirror packages
deb http://ppa.launchpad.net/varying-vagrant-vagrants/php/ubuntu bionic main
deb-src http://ppa.launchpad.net/varying-vagrant-vagrants/php/ubuntu bionic main
deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu bionic main
deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu bionic main
4 changes: 2 additions & 2 deletions provision/core/vvv/sources-ubuntu-focal.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# VVV mirror packages
# deb http://ppa.launchpad.net/varying-vagrant-vagrants/php/ubuntu focal main
# deb-src http://ppa.launchpad.net/varying-vagrant-vagrants/php/ubuntu focal main
# deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu focal main
# deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu focal main
10 changes: 5 additions & 5 deletions provision/provision-helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ export -f containsElement
# @arg $1 string The address to test
# @see check_network_connection_to_host
function network_detection() {
local url=${1:-"http://ppa.launchpad.net"}
local url=${1:-"https://ppa.launchpadcontent.net"}
check_network_connection_to_host "${url}"
}
export -f network_detection

# @description Test that we have network connectivity with a URL.
#
# @arg $1 string The address to test, defaults to `https://ppa.launchpad.net`
# @arg $1 string The address to test, defaults to `https://ppa.launchpadcontent.net`
#
# @exitcode 0 If the address is reachable
# @exitcode 1 If network issues are found
function check_network_connection_to_host() {
local url=${1:-"http://ppa.launchpad.net"}
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}"

# Network Detection
Expand All @@ -91,12 +91,12 @@ function network_check() {
return 0
fi

# Make an HTTP request to ppa.launchpad.net to determine if
# Make an HTTP request to ppa.launchpadcontent.net to determine if
# outside access is available to us. Also check the mariadb mirrors.
#
# If you need to modify this list, contact us on GitHub with the changes.
declare -a hosts_to_test=(
"http://ppa.launchpad.net" # needed for core ubuntu packages
"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
Expand Down