From cd85772a940c15505e412868a91f512b11b19ab1 Mon Sep 17 00:00:00 2001
From: Mark Janssen -- Sig-I/O Automatisering <mark@sig-io.nl>
Date: Thu, 11 Jul 2024 22:03:11 +0200
Subject: [PATCH] Also install vim, install ack, etckeeper

---
 roles/common/defaults/main.yaml |  5 ++++-
 roles/common/tasks/main.yaml    | 19 +++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml
index 000579f..dfa8a76 100644
--- a/roles/common/defaults/main.yaml
+++ b/roles/common/defaults/main.yaml
@@ -14,4 +14,7 @@ network_br: off
 network_dhcp: off
 network_static: off
 
-node_exporter: yes
+node_exporter: true
+
+debian_packages_unwanted:
+  - netcat-traditional
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index b66b565..d1397d4 100644
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -26,10 +26,6 @@
     file: unattended-updates.yaml
   tags: unattended_updates
 
-- tags: apt-minimal
-  ansible.builtin.import_tasks:
-    file: apt-minimal.yaml
-
 - name: Update authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
@@ -51,17 +47,19 @@
     file: node-exporter.yaml
   when: is_vm
 
-- name: Remove Vim
+- name: Remove debian-packages we don't want
   ansible.builtin.apt:
-    name: vim
     state: absent
     autoremove: true
+    pkg: {{ debian_packages_unwanted|default([]) }}
 
-- name: Install utilities
+- name: Install standard packages
   ansible.builtin.apt:
-    name:
+    pkg:
       - curl
       - fzf
+      - ack
+      - etckeeper
       - git
       - htop
       - iptables
@@ -73,10 +71,7 @@
       - rsync
       - tree
       - neovim
-
-- name: Remove netcat-traditional
-  ansible.builtin.apt:
-    name: netcat-traditional
+      - vim
 
 - name: Configure FZF for Bash
   ansible.builtin.lineinfile: