From d0c75a99a732239967ab10ea18efbd0fd01c91bc Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 19 Apr 2024 09:23:03 -0500 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20Default=20to=20PHP=208.2,=20?= =?UTF-8?q?add=20PHP=208.3=20support=20(#1514)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔧 Default to PHP 8.2 * 🔧 Add PHP 8.3 support --- group_vars/all/main.yml | 2 +- roles/php/vars/8.3.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 roles/php/vars/8.3.yml diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index 08700ee18d..77a89e973d 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -3,7 +3,7 @@ apt_package_state: present apt_security_package_state: latest apt_dev_package_state: latest composer_keep_updated: true -php_version: "8.1" +php_version: "8.2" ntp_timezone: Etc/UTC ntp_manage_config: true www_root: /srv/www diff --git a/roles/php/vars/8.3.yml b/roles/php/vars/8.3.yml new file mode 100644 index 0000000000..557f9726a5 --- /dev/null +++ b/roles/php/vars/8.3.yml @@ -0,0 +1,18 @@ +php_extensions_default: + php8.3-bcmath: "{{ apt_package_state }}" + php8.3-cli: "{{ apt_package_state }}" + php8.3-curl: "{{ apt_package_state }}" + php8.3-dev: "{{ apt_package_state }}" + php8.3-fpm: "{{ apt_package_state }}" + php8.3-imagick: "{{ apt_package_state }}" + php8.3-intl: "{{ apt_package_state }}" + php8.3-mbstring: "{{ apt_package_state }}" + php8.3-mysql: "{{ apt_package_state }}" + php8.3-xml: "{{ apt_package_state }}" + php8.3-xmlrpc: "{{ apt_package_state }}" + php8.3-zip: "{{ apt_package_state }}" + +php_memcached_packages: + php8.3-memcached: "{{ apt_package_state }}" + +php_xdebug_package: php8.3-xdebug From 801a825a3824996981f5b79a601ecc4553fb678f Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 23 Apr 2024 09:51:44 -0500 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MariaDB=20apt-key=20is?= =?UTF-8?q?=20deprecated=20failure=20(#1515)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 Fix MariaDB apt-key is deprecated failure * Use apt_repository * Use apt_key module --------- Co-authored-by: Scott Walkinshaw --- roles/mariadb/defaults/main.yml | 2 -- roles/mariadb/tasks/main.yml | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/roles/mariadb/defaults/main.yml b/roles/mariadb/defaults/main.yml index 12a81ad2af..4ec8d0b364 100644 --- a/roles/mariadb/defaults/main.yml +++ b/roles/mariadb/defaults/main.yml @@ -1,6 +1,4 @@ mariadb_version: 10.6 -mariadb_keyserver: "hkp://keyserver.ubuntu.com:80" -mariadb_keyserver_id: "0xF1656F24C74CD1D8" mariadb_ppa: "deb https://mirror.rackspace.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release }} main" mariadb_client_package: mariadb-client diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index de3b9fb072..58d8ea1717 100644 --- a/roles/mariadb/tasks/main.yml +++ b/roles/mariadb/tasks/main.yml @@ -1,24 +1,23 @@ --- -- block: - - name: Add MariaDB APT key - apt_key: - keyserver: "{{ mariadb_keyserver }}" - id: "{{ mariadb_keyserver_id }}" +- name: Add an Apt signing key, uses whichever key is at the URL + ansible.builtin.apt_key: + url: "https://mariadb.org/mariadb_release_signing_key.asc" + state: present - - name: Add MariaDB PPA - apt_repository: - repo: "{{ mariadb_ppa }}" - update_cache: yes +- name: Add MariaDB PPA + apt_repository: + repo: "{{ mariadb_ppa }}" + update_cache: yes - name: Install MySQL client - apt: + ansible.builtin.apt: name: "{{ mariadb_client_package }}" state: "{{ mariadb_client_package_state | default(apt_package_state) }}" - cache_valid_time: "{{ apt_cache_valid_time }}" + update_cache: true - block: - name: Install MySQL server - apt: + ansible.builtin.apt: name: "{{ mariadb_server_package }}" state: "{{ mariadb_server_package_state | default(apt_package_state) }}" cache_valid_time: "{{ apt_cache_valid_time }}" From b791d54e8f6c9dcc5a909a51d9368136cf04f455 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Wed, 24 Apr 2024 12:51:06 -0500 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20Update=20CHANGELOG=20[ci=20s?= =?UTF-8?q?kip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cd552c6d8..3b0674453c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +### 1.22.0: April 24th, 2024 +* Fix MariaDB apt-key is deprecated failure [#1515](https://github.com/roots/trellis/pull/1515) +* Default to PHP 8.2, add PHP 8.3 support [#1514](https://github.com/roots/trellis/pull/1514) +* Add PHP JIT and enable it by default [#1505](https://github.com/roots/trellis/pull/1505) +* Update wp_cli_version to 2.9.0 [#1508](https://github.com/roots/trellis/pull/1508) +* Add `cron` to default `apt` packages [#1506](https://github.com/roots/trellis/pull/1506) +* Enable PHP OPCache overwrites for `max_wasted_percentage` & `huge_code_pages` [#1503](https://github.com/roots/trellis/pull/1503) +* Add MariaDB server config for optimizatons [#1497](https://github.com/roots/trellis/pull/1497) +* Add PHP-FPM conf and tuning settings [#1496](https://github.com/roots/trellis/pull/1496) +* CLI config updates [#1486](https://github.com/roots/trellis/pull/1486) +* Update Bitbucket Cloud SSH Host Keys [#1492](https://github.com/roots/trellis/pull/1492) +* Add Libvirt to the Vagrant config file [#1490](https://github.com/roots/trellis/pull/1490) + +**Full Changelog**: https://github.com/roots/trellis/compare/v1.21.0...v1.22.0 + ### 1.21.0: April 5th, 2023 * Add optional PHP 8.2 support [#1485](https://github.com/roots/trellis/pull/1485) * Default to PHP 8.1 [#1484](https://github.com/roots/trellis/pull/1484)