Add a distinct nodesource role

chat.yaml

@@ -6,4 +6,5 @@
     - { role: "nft", tags: [ "nft" ] }
     - { role: "nginx", tags: [ "nginx" ] }
     - { role: "acme", tags: [ "acme" ] }
+    - { role: "nodesource", tags: [ "nodesource" ] }
     - { role: "chat", tags: [ "chat" ] }

pad.yaml

@@ -9,4 +9,5 @@
     - { role: "nft", tags: [ "nft" ] }
     - { role: "acme", tags: [ "acme" ] }
     - { role: "nginx", tags: [ "nginx" ] }
+    - { role: "nodesource", tags: [ "nodesource" ] }
     - { role: "etherpad", tags: [ "etherpad" ] }

roles/chat/tasks/main.yaml

@@ -4,17 +4,8 @@
   ansible.builtin.apt:
     state: present
     pkg:
-      - gpg
-      - apt-transport-https
       - build-essential
-
-- name: Import nodesource signing key
-  ansible.builtin.shell:
-    cmd: curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor
-      -o /usr/share/keyrings/nodesource.gpg
-  args:
-    creates: /usr/share/keyrings/nodesource.gpg
-  notify: Apt update
+      - nodejs
 
 - name: Ensure directories are present
   ansible.builtin.file:
@@ -30,20 +21,8 @@
   notify:
     - Restart thelounge
 
-- name: Configure templates
-  ansible.builtin.template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ item.owner | default( chat_user ) }}"
-    group: "{{ item.group | default( chat_group ) }}"
-    mode: "{{ item.mode | default('0640') }}"
-  with_items:
-    - { src: "nodesource.list", dest: "/etc/apt/sources.list.d/nodesource.list", owner: root, group: root }
-    - { src: "nodejs-apt-pref", dest: "/etc/apt/preferences.d/nodejs", owner: root, group: root }
-
 - name: Install nodejs
   ansible.builtin.apt:
-    name: nodejs
 
 - name: Install yarn
   ansible.builtin.shell:

roles/chat/templates/nodejs-apt-pref

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-Package: nodejs
-Pin: origin deb.nodesource.com
-Pin-Priority: 1000

roles/chat/templates/nodesource.list

@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-deb [arch=amd64 signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_{{ nodejs_version }} nodistro main

roles/etherpad/defaults/main.yaml

@@ -1,4 +1,3 @@
-nodejs_version: 22.x
 etherpad_db_user: etherpad
 etherpad_db_password: "{{ lookup('password', '/tmp/etherpad_db_password length=32') }}"
 etherpad_db_name: etherpad

roles/etherpad/tasks/main.yaml

@@ -3,43 +3,10 @@
 - name: Install dependencies
   ansible.builtin.apt:
     state: present
-    pkg: 
-      - gpg
+    pkg:
+      - nodejs
       - postgresql
       - python3-psycopg2
-      - apt-transport-https
-
-- name: Import nodesource signing key
-  ansible.builtin.shell:
-    cmd: curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor
-      -o /usr/share/keyrings/nodesource.gpg
-  args:
-    creates: /usr/share/keyrings/nodesource.gpg
-  notify: apt update
-
-- name: Install nodesource source list
-  ansible.builtin.template:
-    src: nodesource.list
-    dest: /etc/apt/sources.list.d/nodesource.list
-    owner: root
-    group: root
-    mode: 0644
-  notify: apt update
-
-- name: Install nodejs apt preference
-  ansible.builtin.template:
-    src: nodejs-apt-pref
-    dest: /etc/apt/preferences.d/nodejs
-    owner: root
-    group: root
-    mode: 0644
-  notify: apt update
-
-- ansible.builtin.meta: flush_handlers
-
-- name: Install nodejs
-  ansible.builtin.apt:
-    name: nodejs
 
 - name: Add database user
   become: true

roles/nodesource/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+nodesource_version: 22.x

roles/nodesource/handlers/main.yaml

@@ -0,0 +1,3 @@
+---
+- ansible.builtin.import_tasks:
+    file: ../../common/handlers/main.yaml

roles/nodesource/tasks/main.yaml

@@ -0,0 +1,33 @@
+---
+- name: Install dependencies
+  ansible.builtin.apt:
+    state: present
+    pkg:
+      - apt-transport-https
+      - gpg
+
+- name: Import nodesource signing key
+  ansible.builtin.shell:
+    cmd: |
+      set -o pipefail
+      curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg
+    executable: /bin/bash
+  args:
+    creates: /usr/share/keyrings/nodesource.gpg
+  notify: apt update
+
+- name: Install nodesource apt files
+  ansible.builtin.template:
+    src: nodesource.list
+    dest: /etc/apt/sources.list.d/nodesource.list
+    owner: root
+    group: root
+    mode: 0644
+  notify: apt update
+  with_items:
+    - src: nodesource.list
+      dest: /etc/apt/sources.list.d/nodesource.list
+    - src: nodejs-apt-pref
+      dest: /etc/apt/preferences.d/nodejs
+
+- ansible.builtin.meta: flush_handlers

roles/nodesource/templates/nodesource.list

@@ -1,3 +1,3 @@
 # {{ ansible_managed }}
 
-deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_{{ nodejs_version }} nodistro main
+deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_{{ nodesource_version }} nodistro main