From 606548db7efbeacc4c7790d1090ae58888419714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavi=20Lle=C3=B3=20Tom=C3=A1s?= <xavi@verdnatura.es>
Date: Mon, 7 Oct 2024 12:06:19 +0200
Subject: [PATCH] Refs #8025 Resolv task moved to debian-base role - Review &
 refactor tasks from debian-base role defuser, install and locate

---
 roles/debian-base/handlers/main.yml           |  1 -
 roles/debian-base/tasks/install.yml           |  8 ++++++-
 roles/debian-base/tasks/locale.yml            | 21 ++++++-------------
 roles/debian-base/tasks/main.yml              |  2 ++
 .../tasks/resolv.yml                          |  0
 .../templates/resolv.conf                     |  0
 roles/debian-host/tasks/main.yml              |  2 --
 7 files changed, 15 insertions(+), 19 deletions(-)
 rename roles/{debian-host => debian-base}/tasks/resolv.yml (100%)
 rename roles/{debian-host => debian-base}/templates/resolv.conf (100%)

diff --git a/roles/debian-base/handlers/main.yml b/roles/debian-base/handlers/main.yml
index 524348c..76239c2 100644
--- a/roles/debian-base/handlers/main.yml
+++ b/roles/debian-base/handlers/main.yml
@@ -18,4 +18,3 @@
   service:
     name: nagios-nrpe-server
     state: restarted
-
diff --git a/roles/debian-base/tasks/install.yml b/roles/debian-base/tasks/install.yml
index e02d485..635d024 100644
--- a/roles/debian-base/tasks/install.yml
+++ b/roles/debian-base/tasks/install.yml
@@ -7,4 +7,10 @@
     - psmisc
     - bash-completion
     - screen
-    - aptitude
\ No newline at end of file
+    - aptitude
+    - vim
+    - aptitude
+    - tree
+    - btop
+    - ncdu
+    - debconf-utils
diff --git a/roles/debian-base/tasks/locale.yml b/roles/debian-base/tasks/locale.yml
index 218c067..faf125b 100644
--- a/roles/debian-base/tasks/locale.yml
+++ b/roles/debian-base/tasks/locale.yml
@@ -1,15 +1,6 @@
-- name: Enable locale languages
-  lineinfile:
-    dest: /etc/locale.gen
-    regexp: "{{item.regexp}}"
-    line: "{{item.line}}"
-    state: present
-  with_items:
-    - regexp: "^# es_ES.UTF-8 UTF-8"
-      line: "es_ES.UTF-8 UTF-8"
-    - regexp: "^# en_US.UTF-8 UTF-8"
-      line: "en_US.UTF-8 UTF-8"
-- name: Generate locale
-  command: locale-gen
-- name: Update locale
-  command: update-locale LANG=en_US.UTF-8
+- name: Set to generate locales
+  debconf:
+    name: locales
+    question: locales/locales_to_be_generated
+    value: en_US.UTF-8 UTF-8, es_ES.UTF-8 UTF-8
+    vtype: multiselect
diff --git a/roles/debian-base/tasks/main.yml b/roles/debian-base/tasks/main.yml
index 405ee97..ab9c185 100644
--- a/roles/debian-base/tasks/main.yml
+++ b/roles/debian-base/tasks/main.yml
@@ -1,3 +1,5 @@
+- import_tasks: resolv.yml
+  tags: resolv
 - import_tasks: defuser.yml
   tags: defuser
 - import_tasks: install.yml
diff --git a/roles/debian-host/tasks/resolv.yml b/roles/debian-base/tasks/resolv.yml
similarity index 100%
rename from roles/debian-host/tasks/resolv.yml
rename to roles/debian-base/tasks/resolv.yml
diff --git a/roles/debian-host/templates/resolv.conf b/roles/debian-base/templates/resolv.conf
similarity index 100%
rename from roles/debian-host/templates/resolv.conf
rename to roles/debian-base/templates/resolv.conf
diff --git a/roles/debian-host/tasks/main.yml b/roles/debian-host/tasks/main.yml
index 11d6c3f..e4f179a 100644
--- a/roles/debian-host/tasks/main.yml
+++ b/roles/debian-host/tasks/main.yml
@@ -4,5 +4,3 @@
   tags: sysctl
 - import_tasks: apparmor.yml
   tags: apparmor
-- import_tasks: resolv.yml
-  tags: resolv