From de0a69ede5ba73577a2a0accfd2da446f9904ae0 Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Mon, 24 Jun 2024 05:51:36 +0000
Subject: [PATCH] replace expired nginx key

---
 ansible/roles/trmm_dev/tasks/main.yml | 2 +-
 install.sh                            | 2 +-
 restore.sh                            | 2 +-
 update.sh                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/trmm_dev/tasks/main.yml b/ansible/roles/trmm_dev/tasks/main.yml
index a3d3e2d4..0eb0e623 100644
--- a/ansible/roles/trmm_dev/tasks/main.yml
+++ b/ansible/roles/trmm_dev/tasks/main.yml
@@ -329,7 +329,7 @@
   tags: nginx
   become: yes
   ansible.builtin.apt_key:
-    url: https://nginx.org/packages/keys/nginx_signing.key
+    url: https://nginx.org/keys/nginx_signing.key
     state: present
 
 - name: add nginx repo
diff --git a/install.sh b/install.sh
index b4f21793..0c248547 100644
--- a/install.sh
+++ b/install.sh
@@ -244,7 +244,7 @@ print_green 'Installing Nginx'
 
 sudo mkdir -p /etc/apt/keyrings
 
-wget -qO - https://nginx.org/packages/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
+wget -qO - https://nginx.org/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
 
 nginxrepo="$(
   cat <<EOF
diff --git a/restore.sh b/restore.sh
index fc9b4528..6beee4ed 100755
--- a/restore.sh
+++ b/restore.sh
@@ -138,7 +138,7 @@ sudo npm install -g npm
 
 print_green 'Restoring Nginx'
 
-wget -qO - https://nginx.org/packages/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
+wget -qO - https://nginx.org/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
 
 nginxrepo="$(
   cat <<EOF
diff --git a/update.sh b/update.sh
index fd67c37c..8bd9156f 100644
--- a/update.sh
+++ b/update.sh
@@ -167,7 +167,7 @@ deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/pac
 EOF
   )"
   echo "${nginxrepo}" | sudo tee /etc/apt/sources.list.d/nginx.list >/dev/null
-  wget -qO - https://nginx.org/packages/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
+  wget -qO - https://nginx.org/keys/nginx_signing.key | sudo gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg
   sudo apt update
   sudo apt install -y nginx
 fi