From c4f4c6626d22aaefdb75756c70bd1618281c8694 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Mon, 1 Feb 2021 21:36:00 +0100
Subject: [PATCH] Style changes

---
 defaults/main.yml      |  3 +++
 tasks/main.yml         | 30 ++++++++++++++----------------
 vars/archlinux.yml     |  4 +---
 vars/debian-buster.yml | 10 +++++-----
 vars/ubuntu-focal.yml  | 10 +++++-----
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 843b32d..86e3c89 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,5 @@
 node_version: '12'
 node_gpg_key: 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+
+npm_packages: []
+npm_pre_packages: []
diff --git a/tasks/main.yml b/tasks/main.yml
index a681023..cb19efb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,48 +11,46 @@
 - name: update apt cache
   become: true
   apt:
-    update_cache: yes
-  when: ansible_facts['os_family'] == "Debian" or ansible_facts['os_family'] == "Ubuntu"
+    update_cache: true
+  when: ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu'
 
 - name: update pacman cache
   become: true
   pacman:
-    update_cache: yes
-  when: ansible_facts['os_family'] == "Archlinux"
+    update_cache: true
+  when: ansible_facts['os_family'] == 'Archlinux'
 
 - name: install needed tools
-  become: yes
+  become: true
   package:
-    name: '{{ item }}'
+    name: '{{ npm_pre_packages }}'
     state: present
-  loop: '{{ pre_packages }}'
 
 - name: add nodesource apt key
-  become: yes
+  become: true
   apt_key:
     url: '{{ node_gpg_key }}'
     state: present
-  when: ansible_facts['os_family'] == "Debian" or ansible_facts['os_family'] == "Ubuntu"
+  when: ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu'
 
 - name: add nodesource source
-  become: yes
+  become: true
   template:
     src: 'nodesource.list.j2'
     dest: '/etc/apt/sources.list.d/nodesource.list'
     mode: '0600'
-  when: ansible_facts['os_family'] == "Debian" or ansible_facts['os_family'] == "Ubuntu"
+  when: ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu'
 
 - name: create apt pinning file
-  become: yes
+  become: true
   template:
     src: 'nodesource.j2'
     dest: '/etc/apt/preferences.d/nodesource'
     mode: '0644'
-  when: ansible_facts['os_family'] == "Debian" or ansible_facts['os_family'] == "Ubuntu"
+  when: ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu'
 
 - name: install front-end packages
-  become: yes
+  become: true
   package:
-    name: '{{ item }}'
+    name: '{{ npm_packages }}'
     state: present
-  loop: '{{ packages }}'
diff --git a/vars/archlinux.yml b/vars/archlinux.yml
index 5f81d8a..0a915bc 100644
--- a/vars/archlinux.yml
+++ b/vars/archlinux.yml
@@ -1,5 +1,3 @@
-pre_packages: []
-
-packages:
+npm_packages:
   - nodejs
   - npm
diff --git a/vars/debian-buster.yml b/vars/debian-buster.yml
index deefc80..0cdb614 100644
--- a/vars/debian-buster.yml
+++ b/vars/debian-buster.yml
@@ -1,7 +1,7 @@
-pre_packages:
-  - gpg
-  - git
-
-packages:
+npm_packages:
   - nodejs
   - npm
+
+npm_pre_packages:
+  - gpg
+  - git
diff --git a/vars/ubuntu-focal.yml b/vars/ubuntu-focal.yml
index 56ecdbd..073991e 100644
--- a/vars/ubuntu-focal.yml
+++ b/vars/ubuntu-focal.yml
@@ -1,8 +1,8 @@
-pre_packages:
+npm_packages:
+  - nodejs
+  - npm
+
+npm_pre_packages:
   - gpg
   - gpg-agent
   - openssh-client
-
-packages:
-  - nodejs
-  - npm