From 1d0144c388f75574f5a159b8732e3c806753af77 Mon Sep 17 00:00:00 2001
From: talklittle <talklittle+gitlab@gmail.com>
Date: Mon, 3 Feb 2025 04:45:11 +0000
Subject: [PATCH] Restore project APT repos which are more up-to-date than
 Debian repo

Closes tildes-community/tildes-cf#31

See merge request tildes-community/tildes-cf!15
---
 ansible/roles/nginx/tasks/main.yml      |  8 ++++++++
 ansible/roles/nodejs/tasks/main.yml     | 12 +++++++++---
 ansible/roles/postgresql/tasks/main.yml |  8 ++++++++
 docker/Dockerfile-for-vagrant           |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index ceca079..f0226be 100644
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- 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 bookworm nginx
+
 - name: Install nginx
   apt:
     name: nginx
diff --git a/ansible/roles/nodejs/tasks/main.yml b/ansible/roles/nodejs/tasks/main.yml
index 63311c0..61d71f1 100644
--- a/ansible/roles/nodejs/tasks/main.yml
+++ b/ansible/roles/nodejs/tasks/main.yml
@@ -1,9 +1,15 @@
 ---
+- name: Add APT key for NodeSource Node.js repository
+  apt_key:
+    url: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
+
+- name: Add NodeSource Node.js APT repository
+  apt_repository:
+    repo: deb https://deb.nodesource.com/node_20.x nodistro main
+
 - name: Install Node.js
   apt:
-    name:
-      - nodejs
-      - npm
+    name: nodejs
 
 - 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 eb6b339..a4f72cd 100644
--- a/ansible/roles/postgresql/tasks/main.yml
+++ b/ansible/roles/postgresql/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- 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 https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main
+
 - name: Install PostgreSQL
   apt:
     name: postgresql-{{ postgresql_version }}
diff --git a/docker/Dockerfile-for-vagrant b/docker/Dockerfile-for-vagrant
index ef62dc9..8380386 100644
--- a/docker/Dockerfile-for-vagrant
+++ b/docker/Dockerfile-for-vagrant
@@ -1,5 +1,5 @@
 FROM debian:12
-ENV container docker
+ENV container=docker
 
 RUN adduser --quiet vagrant \
   && echo "vagrant:vagrant" | chpasswd