Merge branch 'master' of https://github.com/roots/trellis

creame · Jun 6, 2024 · 1e194b5 · 1e194b5
2 parents ac15ba9 + db7341f
commit 1e194b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.22.1: May 30th, 2024
+* Fix Nginx apt-key is deprecated failure [#1518](https://github.com/roots/trellis/pull/1518)
+
 ### 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)

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 Trellis is an open source project and completely free to use. If you've benefited from our projects and would like to support our future endeavors, please consider [sponsoring Roots](https://github.com/sponsors/roots).
 
 <div align="center">
-<a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="120" height="90"></a> <a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="120" height="90"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="120" height="90"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="120" height="90"></a>
+<a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="120" height="90"></a> <a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="120" height="90"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="120" height="90"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="120" height="90"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="Itineris" width="120" height="90"></a>
 </div>
 
 ## Overview

diff --git a/roles/mariadb/defaults/main.yml b/roles/mariadb/defaults/main.yml
@@ -1,4 +1,4 @@
-mariadb_version: 10.6
+mariadb_version: 10.11
 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/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-nginx_keyserver: "https://nginx.org/keys/nginx_signing.key"
-nginx_keyserver_id: "ABF5BD827BD9BF62"
 nginx_ppa: "deb http://nginx.org/packages/mainline/ubuntu {{ ansible_distribution_release }} nginx"
 nginx_package: nginx
 nginx_conf: nginx.conf.j2

diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
 - name: Add Nginx APT key
-  apt_key:
-    keyserver: "{{ nginx_keyserver }}"
-    id: "{{ nginx_keyserver_id }}"
+  ansible.builtin.apt_key:
+    url: "https://nginx.org/keys/nginx_signing.key"
+    state: present
 
 - name: Add Nginx PPA
   apt_repository:
     repo: "{{ nginx_ppa }}"
     update_cache: yes
 
 - name: Install Nginx
-  apt:
+  ansible.builtin.apt:
     name: "{{ nginx_package }}"
     state: "{{ nginx_package_state | default(apt_package_state) }}"
-    cache_valid_time: "{{ apt_cache_valid_time }}"
+    update_cache: true
 
 - name: Ensure site directories exist
   file: