From 1adb1f48a4bfcc0156120e8cfda2cf11c1b286ad Mon Sep 17 00:00:00 2001
From: Silas <69711739+SilasPeters@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:20:11 +0200
Subject: [PATCH] chore: removed global yarn install

In the previous commit, we removed the global Nodejs install, replaced by a
global nvm install. Yarn should also be installed locally and not globally.
---
 ansible/main.yml                                |  4 ++--
 ansible/roles/{node => nvm}/tasks/main.yml      | 17 -----------------
 .../packages/templates/50unattended-upgrades.j2 |  1 -
 3 files changed, 2 insertions(+), 20 deletions(-)
 rename ansible/roles/{node => nvm}/tasks/main.yml (63%)

diff --git a/ansible/main.yml b/ansible/main.yml
index 7981ba15..266dbb16 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -26,8 +26,8 @@
       tags: "docker"
     - role: "databases"
       tags: "databases"
-    - role: "node"
-      tags: "node"
+    - role: "nvm"
+      tags: "nvm"
     - role: "backups"
       tags: "backups"
     - role: "nginx"
diff --git a/ansible/roles/node/tasks/main.yml b/ansible/roles/nvm/tasks/main.yml
similarity index 63%
rename from ansible/roles/node/tasks/main.yml
rename to ansible/roles/nvm/tasks/main.yml
index d25d1f84..a4d20f33 100644
--- a/ansible/roles/node/tasks/main.yml
+++ b/ansible/roles/nvm/tasks/main.yml
@@ -1,19 +1,4 @@
 ---
-- name: "Add apt key for yarn repository"
-  ansible.builtin.apt_key:
-    url: "https://dl.yarnpkg.com/debian/pubkey.gpg"
-    state: "present"
-
-- name: "Add yarn repository"
-  ansible.builtin.apt_repository:
-    repo: "deb https://dl.yarnpkg.com/debian/ stable main"
-    state: "present"
-
-- name: "install yarn"
-  ansible.builtin.apt:
-    name: "yarn"
-    state: "present"
-
 - name: "Install nvm"
   ansible.builtin.git:
     repo: "https://github.com/nvm-sh/nvm.git"
@@ -42,5 +27,3 @@
     path: "{{ nvm.directory }}"
     group: "nvm"
     mode: "0774"
-
-# TODO yarn komt om de hoek kijken. Verwijderen? (rg -C 2 yarn)
diff --git a/ansible/roles/packages/templates/50unattended-upgrades.j2 b/ansible/roles/packages/templates/50unattended-upgrades.j2
index 4293b4f8..73af81d5 100644
--- a/ansible/roles/packages/templates/50unattended-upgrades.j2
+++ b/ansible/roles/packages/templates/50unattended-upgrades.j2
@@ -9,7 +9,6 @@ Unattended-Upgrade::Allowed-Origins {
 	"${distro_id} stable";
 	"${distro_id} ${distro_codename}-updates";
 	"LP-PPA-certbot-certbot:${distro_codename}";
-	"yarn:stable";
 {% endif %}
 };