Skip to content

Provisioning enhancements May 2025 #2761

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

Merged
merged 11 commits into from
May 21, 2025
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ permalink: /docs/en-US/changelog/
* Github action improvements ( #2739 )
* Improved noroot to check for vagrant users and fallback if not present ( #2739 )
* Greatly improved database backup and import script checks and output ( #2759 )
* Faster checks for when packages are installed
* Use curl for network checks first, falling back to wget
* New automated Ubuntu EOL checks
* Optional script to remove provisioner logs older than 1 year
* New timing logs for provisioners to track hook/provisioner performance
* Timings no longer show empty leading values

### Bug Fixes

Expand All @@ -30,6 +36,7 @@ permalink: /docs/en-US/changelog/
### Maintenance

* Refactored git-lfs signing key to the newer GPG key ( #2739 )
* Various provisioner resilience improvements

## 3.14.1 ( 2025 February 23rd )

Expand Down
7 changes: 5 additions & 2 deletions provision/core/git/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ set -eo pipefail

# @noargs
function git_register_apt_sources() {
local OSID=$(lsb_release --id --short)
local OSCODENAME=$(lsb_release --codename --short)
local OSCODENAME
local OSID

OSCODENAME=$(lsb_release --codename --short)
OSID=$(lsb_release --id --short)

if [ "${OSID}" == "Ubuntu" ]; then
if ! vvv_src_list_has "git-core/ppa"; then
Expand Down
7 changes: 3 additions & 4 deletions provision/core/php/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,16 @@ vvv_add_hook nginx_upstreams php_nginx_upstream

function vvv_php_memcached_register_packages() {
VVV_PACKAGE_LIST+=(
php${VVV_BASE_PHPVERSION}-memcache
php${VVV_BASE_PHPVERSION}-memcached
"php${VVV_BASE_PHPVERSION}-memcache"
"php${VVV_BASE_PHPVERSION}-memcached"
)
}
export -f vvv_php_memcached_register_packages
vvv_add_hook before_packages vvv_php_memcached_register_packages


function vvv_php_redis_register_packages() {
VVV_PACKAGE_LIST+=(
php${VVV_BASE_PHPVERSION}-redis
"php${VVV_BASE_PHPVERSION}-redis"
)
}
export -f vvv_php_redis_register_packages
Expand Down
10 changes: 7 additions & 3 deletions provision/core/vvv/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ function vvv_register_packages() {
vvv_add_hook register_apt_packages vvv_register_packages 0

function vvv_register_apt_sources() {
local OSID=$(lsb_release --id --short)
local OSCODENAME=$(lsb_release --codename --short)
local OSCODENAME
local OSID

OSID=$(lsb_release --id --short)
OSCODENAME=$(lsb_release --codename --short)

local APTSOURCE="/srv/provision/core/vvv/sources-${OSID,,}-${OSCODENAME,,}.list"
if [ -f "${APTSOURCE}" ]; then
cp -f "${APTSOURCE}" "/etc/apt/sources.list.d/vvv-sources.list"
Expand All @@ -82,7 +86,7 @@ vvv_add_hook register_apt_sources vvv_register_keys 0
function vvv_before_packages() {
# this package and another are necessary to ensure certificate trust store is up to date
# without this, some mirrors will faill due to changing letsencrypt intermediate root certificates
if [ $(dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
if ! vvv_is_apt_pkg_installed "ca-certificates"; then
vvv_info " * Installing updated certificate stores before proceeding"
apt-get --yes install ca-certificates libgnutls30
vvv_info " * Installing updated certificate stores completed with code ${?}"
Expand Down
Loading