Merge pull request #2710 from Varying-Vagrant-Vagrants/fix/2709

2709: Fix an expired Nginx signing key

.gitattributes

@@ -6,3 +6,4 @@
 *.gif binary
 *.jpg binary
 *.jpeg binary
+*.gpg binary

CHANGELOG.md

@@ -28,6 +28,7 @@ permalink: /docs/en-US/changelog/
 
 * The host file inside the VM was only adding sites with `127.0.0.1` addresses, now it adds the IPVv6 `::1` too ( #2689 )
 * Removed old MacOS PR workflows, no runners available ( #2698 )
+* Replace an outdated Nginx signing key ( #2710 )
 
 ## 3.12 ( 2023 August 3rd )
 

provision/core/nginx/provision.sh

@@ -13,15 +13,20 @@ function nginx_register_apt_sources() {
   fi
 }
 vvv_add_hook register_apt_sources nginx_register_apt_sources
-
 function nginx_register_apt_keys() {
   # Before running `apt-get update`, we should add the public keys for
   # the packages that we are installing from non standard sources via
   # our appended apt source.list
+  if vvv_apt_keys_has '573B FD6B 3D8F BC64 1079  A6AB ABF5 BD82 7BD9 BF62'; then
+    # Retrieve the Nginx signing key from nginx.org
+    vvv_info " * Replacing expired Nginx signing key..."
+    apt-key add /srv/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg
+  fi
+
   if ! vvv_apt_keys_has 'nginx'; then
     # Retrieve the Nginx signing key from nginx.org
-    vvv_info " * Applying Nginx signing key..."
-    apt-key add /srv/provision/core/nginx/apt-keys/nginx_signing.key
+    vvv_info " * Adding Nginx signing key..."
+    apt-key add /srv/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg
   fi
 }
 vvv_add_hook register_apt_keys nginx_register_apt_keys