From f9346d829d1deedaf05b8282daa549adcb4f8e01 Mon Sep 17 00:00:00 2001
From: Andrew Shu <talklittle@gmail.com>
Date: Sat, 9 Nov 2024 21:10:08 -0800
Subject: [PATCH] ansible: install from Debian repository, not third party APT
 repositories

* nginx
* nodejs and npm
* postgresql
---
 ansible/roles/nginx/tasks/main.yml      |  8 --------
 ansible/roles/nodejs/tasks/main.yml     | 12 +++---------
 ansible/roles/postgresql/tasks/main.yml |  8 --------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index 467449d..9fb84b9 100644
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -1,12 +1,4 @@
 ---
-- name: Add APT key for nginx repository
-  apt_key:
-    url: https://nginx.org/keys/nginx_signing.key
-
-- name: Add nginx APT repository
-  apt_repository:
-    repo: deb http://nginx.org/packages/debian/ buster nginx
-
 - name: Install nginx
   apt:
     name: nginx
diff --git a/ansible/roles/nodejs/tasks/main.yml b/ansible/roles/nodejs/tasks/main.yml
index 7336ede..f402c3a 100644
--- a/ansible/roles/nodejs/tasks/main.yml
+++ b/ansible/roles/nodejs/tasks/main.yml
@@ -1,15 +1,9 @@
 ---
-- name: Add APT key for NodeSource Node.js repository
-  apt_key:
-    url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
-
-- name: Add NodeSource Node.js APT repository
-  apt_repository:
-    repo: deb https://deb.nodesource.com/node_14.x buster main
-
 - name: Install Node.js
   apt:
-    name: nodejs
+    name:
+      - nodejs
+      - npm
 
 - name: Install npm packages defined in package.json
   become_user: "{{ app_username }}"
diff --git a/ansible/roles/postgresql/tasks/main.yml b/ansible/roles/postgresql/tasks/main.yml
index f925e67..025083d 100644
--- a/ansible/roles/postgresql/tasks/main.yml
+++ b/ansible/roles/postgresql/tasks/main.yml
@@ -1,12 +1,4 @@
 ---
-- name: Add APT key for PostgreSQL repository
-  apt_key:
-    url: https://www.postgresql.org/media/keys/ACCC4CF8.asc
-
-- name: Add PostgreSQL APT repository
-  apt_repository:
-    repo: deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main
-
 - name: Install PostgreSQL
   apt:
     name: postgresql-{{ postgresql_version }}