From 22ce286cd6f2bc5a2d995481718acadc6ee859cb Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:36:40 +0000 Subject: [PATCH 01/18] switch to php 8.2 as the default Switch to 8.2 as the default PHP, 8.0 is no longer supported, 8.1 is security fixes only, and 8.3 is brand new, so 8.2 it is! If people need 8.0 or other versions they can use the core extensions --- provision/core/php/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/core/php/provision.sh b/provision/core/php/provision.sh index ffb2a7cdc..009193f12 100644 --- a/provision/core/php/provision.sh +++ b/provision/core/php/provision.sh @@ -2,7 +2,7 @@ # @description Installs the default version of PHP set -eo pipefail -VVV_BASE_PHPVERSION=${VVV_BASE_PHPVERSION:-"8.0"} +VVV_BASE_PHPVERSION=${VVV_BASE_PHPVERSION:-"8.2"} function php_before_packages() { cp -f "/srv/provision/core/php/ondrej-ppa-pin" "/etc/apt/preferences.d/ondrej-ppa-pin" From e1671d599708dd6fcf3ba8e9e59b375dda591f8d Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:37:36 +0000 Subject: [PATCH 02/18] Update php-fpm.conf --- config/php-config/php-fpm.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/php-config/php-fpm.conf b/config/php-config/php-fpm.conf index db615a4d2..9730f6f04 100644 --- a/config/php-config/php-fpm.conf +++ b/config/php-config/php-fpm.conf @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - /usr otherwise -;include=/etc/php/7.4/fpm/*.conf +;include=/etc/php/8.2/fpm/*.conf ;;;;;;;;;;;;;;;;;; ; Global Options ; @@ -22,14 +22,14 @@ ; Pid file ; Note: the default prefix is /var ; Default Value: none -pid = /run/php/php8.0-fpm.pid +pid = /run/php/php8.2-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written ; in a local file. ; Note: the default prefix is /var ; Default Value: log/php-fpm.log -error_log = /var/log/php/php8.0-fpm.log +error_log = /var/log/php/php8.2-fpm.log ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities @@ -126,4 +126,4 @@ error_log = /var/log/php/php8.0-fpm.log ; To configure the pools it is recommended to have one .conf file per ; pool in the following directory: -include=/etc/php/8.0/fpm/pool.d/*.conf +include=/etc/php/8.2/fpm/pool.d/*.conf From 2e6a2a9938de00f41a183eeabb5bb6367e1a92af Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:38:02 +0000 Subject: [PATCH 03/18] Update upstream.conf --- config/php-config/upstream.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/php-config/upstream.conf b/config/php-config/upstream.conf index 15c43c1e1..9adefe64c 100644 --- a/config/php-config/upstream.conf +++ b/config/php-config/upstream.conf @@ -1,4 +1,4 @@ # Upstream to abstract backend connection(s) for PHP. -upstream php80 { - server unix:/var/run/php8.0-fpm.sock; +upstream php82 { + server unix:/var/run/php8.2-fpm.sock; } From f472154d86ca45728101c28c45e884e4d26edf44 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:38:30 +0000 Subject: [PATCH 04/18] Update php-www.conf --- config/php-config/php-www.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/php-config/php-www.conf b/config/php-config/php-www.conf index fcbb4f56d..b129af05b 100644 --- a/config/php-config/php-www.conf +++ b/config/php-config/php-www.conf @@ -30,7 +30,7 @@ group = www-data ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php8.0-fpm.sock +listen = /var/run/php8.2-fpm.sock ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) From e008cda2a256d6dad1777559c56dca9ffa34d674 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:39:21 +0000 Subject: [PATCH 05/18] Update default-config.yml --- config/default-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default-config.yml b/config/default-config.yml index ff42e399f..824132dac 100644 --- a/config/default-config.yml +++ b/config/default-config.yml @@ -90,7 +90,7 @@ extensions: #- php74 #- php80 #- php81 - #- php82 + #- php83 # vm_config controls how Vagrant provisions the virtual machine, and can be used to # increase the memory given to VVV and the number of CPU cores. From 36228648a9633164f814fac79c45ac2b8c6d6ae0 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:40:29 +0000 Subject: [PATCH 06/18] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfec2791d..bde119965 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ permalink: /docs/en-US/changelog/ ### Enhancements -* Switched the default PHP to v8.0 ( #2658 ) +* Switched the default PHP to v8.2 ( #2690 ) * WP Coding standards v3 ( #2688 ) * VIP Coding standards v3 ( #2688 ) * Better error messages with links to docs when trying to use a PHP version that isn't installed ( #2689 ) From 6b53d26cfbcdc661089fdc2a24bf996700b7bdaf Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:40:56 +0000 Subject: [PATCH 07/18] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bde119965..3e1ea9e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ permalink: /docs/en-US/changelog/ # Changelog -## 3.13 ( 2023 ) +## 3.13 ( 2023 December TBA ) ### Enhancements From 9f9a1b3150859fe5a792b3c1c8981fdaa468a1f0 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 10:56:23 +0000 Subject: [PATCH 08/18] Update provision-site.sh for php 8.2 --- provision/provision-site.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/provision-site.sh b/provision/provision-site.sh index 064e6f075..0c8b897c7 100644 --- a/provision/provision-site.sh +++ b/provision/provision-site.sh @@ -25,7 +25,7 @@ VVV_SITE_NAME=${SITE} VVV_HOSTS="" SUCCESS=0 -DEFAULTPHP="8.0" +DEFAULTPHP="8.2" VVV_CONFIG=/vagrant/config.yml From 0f2000add94804b7a54d9f94396c852ce3e164d9 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:08:06 +0000 Subject: [PATCH 09/18] Update vvv_restore_php_default --- config/homebin/vvv_restore_php_default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/homebin/vvv_restore_php_default b/config/homebin/vvv_restore_php_default index 0acb9c19f..15aca92bd 100755 --- a/config/homebin/vvv_restore_php_default +++ b/config/homebin/vvv_restore_php_default @@ -1,6 +1,6 @@ -#!/bin/bash +#!/usr/bin/env bash -DEFAULTPHP="8.0" +DEFAULTPHP="8.2" php_version=$(readlink -f /usr/bin/php) if [[ $php_version != *"${DEFAULTPHP}"* ]]; then echo " * Restoring the default PHP CLI version ( ${DEFAULTPHP} )" From 93047930f206cb4aac0f3e8d1c1773af4d6b7a05 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:27:40 +0000 Subject: [PATCH 10/18] upgrade workflow action versions --- .github/workflows/vvv-provisioning.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/vvv-provisioning.yml b/.github/workflows/vvv-provisioning.yml index 530bddd71..6f0c74469 100644 --- a/.github/workflows/vvv-provisioning.yml +++ b/.github/workflows/vvv-provisioning.yml @@ -21,7 +21,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Make Symlinks - name: Create Vagrant Like Environment @@ -104,7 +104,7 @@ jobs: MYGID=$(id -g -n) sudo chown -R $MYUID:$MYGID "$GITHUB_WORKSPACE/log" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: logs-on-docker @@ -119,12 +119,12 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: stable - name: Cache Vagrant boxes - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.vagrant.d/boxes key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} @@ -137,7 +137,7 @@ jobs: - name: vagrant up (stable) run: vagrant up - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: clean: false @@ -147,7 +147,7 @@ jobs: - name: tests run: provision/tests/macos-tests.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: logs-on-stable @@ -161,12 +161,12 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: develop - name: Cache Vagrant boxes - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.vagrant.d/boxes key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} @@ -180,7 +180,7 @@ jobs: - name: vagrant up (develop) run: vagrant up - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: clean: false @@ -190,7 +190,7 @@ jobs: - name: tests run: provision/tests/macos-tests.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: logs-on-develop @@ -204,10 +204,10 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Vagrant boxes - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.vagrant.d/boxes key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} @@ -223,7 +223,7 @@ jobs: - name: tests run: provision/tests/macos-tests.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: logs-on-clean From 61ac5c84e154feab31fc70e4f9de285b3f14cb76 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:32:26 +0000 Subject: [PATCH 11/18] install node 16 not 14 by default --- provision/core/node-nvm/provision.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/provision/core/node-nvm/provision.sh b/provision/core/node-nvm/provision.sh index 715192d4e..302a600f5 100644 --- a/provision/core/node-nvm/provision.sh +++ b/provision/core/node-nvm/provision.sh @@ -53,9 +53,9 @@ function vvv_nvm_setup() { fi - vvv_info " - Installing Node 14 via nvm" - nvm install 14 - nvm use 14 + vvv_info " - Installing Node 16 via nvm" + nvm install 16 + nvm use 16 vvv_info " - Ensuring vagrant user owns its own nvm folder" chown -R vagrant:vagrant /home/vagrant/.nvm/ From 58d8a673fc2b84a5e91632d8d30a10473383ad32 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:39:02 +0000 Subject: [PATCH 12/18] Update default-config.yml --- config/default-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default-config.yml b/config/default-config.yml index 824132dac..8eb09085c 100644 --- a/config/default-config.yml +++ b/config/default-config.yml @@ -36,7 +36,7 @@ sites: skip_provisioning: false description: "A standard WP install, useful for building plugins, testing things, etc" repo: https://github.com/Varying-Vagrant-Vagrants/custom-site-template.git - php: 8.0 # change the PHP version to use for the provision and nginx + #php: 8.0 # change the PHP version to use for the provision and nginx custom: # locale: it_IT delete_default_plugins: true From e4948b4ab869b2a48ebebb8012f8b5f3d8e589cd Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:39:42 +0000 Subject: [PATCH 13/18] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e1ea9e0d..9de53e3fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ permalink: /docs/en-US/changelog/ ### Enhancements -* Switched the default PHP to v8.2 ( #2690 ) +* Switched the default PHP from v7.4 to v8.2 and default Node from v14 to v16 ( #2690 ) * WP Coding standards v3 ( #2688 ) * VIP Coding standards v3 ( #2688 ) * Better error messages with links to docs when trying to use a PHP version that isn't installed ( #2689 ) From 9af28297375277416cec78ee1f048efea196d07f Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:42:43 +0000 Subject: [PATCH 14/18] Update vvv-start.conf --- config/init/vvv-start.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/init/vvv-start.conf b/config/init/vvv-start.conf index 3a2f5c1bd..fed18dbe1 100644 --- a/config/init/vvv-start.conf +++ b/config/init/vvv-start.conf @@ -1,12 +1,12 @@ # vvv - necessary services at start -description "necessary services for VVV" +description "Necessary services for VVV" start on runlevel [2345] script service nginx start -service php7.4-fpm start +service php8.2-fpm start service memcached start service mariadb start service mailhog start From 5dde91b269418442d47357ce2e0097641da692a1 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:43:50 +0000 Subject: [PATCH 15/18] Update nginx.conf --- provision/core/nginx/config/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/core/nginx/config/nginx.conf b/provision/core/nginx/config/nginx.conf index bdb329c06..0ad1c5507 100644 --- a/provision/core/nginx/config/nginx.conf +++ b/provision/core/nginx/config/nginx.conf @@ -133,7 +133,7 @@ http { # Upstream to abstract backend connection(s) for PHP. upstream php { - server unix:/var/run/php8.0-fpm.sock; + server unix:/var/run/php8.2-fpm.sock; } include /etc/nginx/upstreams/*.conf; From fba477fd4a9861ee6713bec0b1f9e80037694b0f Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:47:49 +0000 Subject: [PATCH 16/18] Update site-fallback.conf --- provision/core/nginx/config/site-fallback.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/provision/core/nginx/config/site-fallback.conf b/provision/core/nginx/config/site-fallback.conf index bd7e79621..8aabe0d4b 100644 --- a/provision/core/nginx/config/site-fallback.conf +++ b/provision/core/nginx/config/site-fallback.conf @@ -1,6 +1,6 @@ server { listen 80; - listen 443 ssl http2; + listen 443 ssl; server_name {vvv_hosts}; root "{vvv_path_to_site}/public_html"; @@ -8,9 +8,6 @@ server { error_log "{vvv_path_to_site}/log/nginx-error.log"; access_log "{vvv_path_to_site}/log/nginx-access.log"; - # Enable server push if SSL/HTTP2 is being used for link preload headers - http2_push_preload on; - {vvv_tls_cert} {vvv_tls_key} From 32b12a64c90e71cdbbea6f97b6ab5b6375d267f7 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:54:45 +0000 Subject: [PATCH 17/18] Update bug-report.yml --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 28faf9a10..aff022239 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -94,6 +94,7 @@ body: - 'VirtualBox 5' - 'Parallels (Intel)' - 'Parallels (Apple Silicon/Arm)' + - 'Docker' - 'Hyper-V' - 'VMWare' - 'Other' From 784435ec08348c31d8464e575d6750ed16460855 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 28 Nov 2023 15:57:02 +0000 Subject: [PATCH 18/18] Delete .github/ISSUE_TEMPLATE/monteray-virtualbox-timeouts.yml --- .../monteray-virtualbox-timeouts.yml | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/monteray-virtualbox-timeouts.yml diff --git a/.github/ISSUE_TEMPLATE/monteray-virtualbox-timeouts.yml b/.github/ISSUE_TEMPLATE/monteray-virtualbox-timeouts.yml deleted file mode 100644 index cd9c429cd..000000000 --- a/.github/ISSUE_TEMPLATE/monteray-virtualbox-timeouts.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: I'm using VirtualBox 6.1.26/6.1.28 OR I upgraded to MacOS 12/Monterey -description: Using VirtualBox and getting site timeouts? hostonly network adapter errors? Recently upgraded to MacOS 12? -labels: [ 'type:support' ] -body: - - type: markdown - attributes: - value: | - " - ## MacOS 12 Monterey - - ***Do not upgrade to Monterey.*** - - There are no known working versions of VirtualBox for MacOS 12, do not upgrade. ***VirtualBox intend to fix this in v6.1.29***. - - Until VirtualBox 6.1.29 is officially released, do not upgrade past MacOS 11 Big Sur. Test release builds are not guaranteed to work. - - The fastest way to restore VirtualBox is to downgrade back to MacOS 11 Big Sur, and use v6.1.24. - - ### But My New M1 Mac Only Support MacOS 12! - Use Parallels, new Macs don't support VirtualBox. - - ## Timeouts and VirtualBox 6.1.26 and 6.1.28 - These versions of VirtualBox are known to have networking problems on Linux/Windows/MacOS, not everybody encounters these problems though. - VirtualBox v6.1.24 works though, stick to v6.1.24 until we can confirm if 6.1.29 fixes the problems. - - --- - " - - type: textarea - id: what-happened - attributes: - label: I have news related to this! - description: Did they relelase 6.1.29? Is there a change to the vagrant file that can be made? - placeholder: Tell us what you know! - validations: - required: true