From e15ea7854a86441ea981485e36c2e750c7d3ddd6 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Thu, 29 Aug 2019 07:02:15 +0200
Subject: [PATCH] Base config sync with crans

---
 roles/baseconfig/tasks/main.yml        | 33 +++++++++++++++-----------
 roles/baseconfig/tasks/molly-guard.yml | 18 --------------
 2 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 roles/baseconfig/tasks/molly-guard.yml

diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 9784ac1..5249244 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -4,17 +4,25 @@
   when: ansible_os_family == "Debian"
   apt:
     name:
-      - bash-completion   # for bash users
-      - zsh               # alternative shell
-      - sudo              # to gain root access
-      - git               # code versioning
-      - nano              # basic text editor
-      - vim               # like nano but more powerful and complex
-      - htop              # better than top
-      - less              # i like cats
-      - tree              # create a graphical tree of files
-      - acl               # for Ansible become support
-      - screen            # Vulcain asked for this
+      - sudo
+      - molly-guard  # prevent reboot
+      - ntp  # network time sync
+      - apt  # better than apt-get
+      - nano  # for vulcain
+      - vim  # better than nano
+      - emacs-nox  # for maman
+      - htop  # better than top
+      - zsh  # to be able to ssh @erdnaxe
+      - fish  # to motivate @edpibu
+      - oidentd  # postgresql identification
+      - aptitude  # nice to have for Ansible
+      - acl  # advanced ACL
+      - iotop  # monitor i/o
+      - tree  # create a graphical tree of files
+      - bash-completion  # because bash
+      - git  # code versioning
+      - less  # i like cats
+      - screen  # Vulcain asked for this
     update_cache: true
   register: apt_result
   retries: 3
@@ -60,9 +68,6 @@
     vtype: select
   notify: Reconfigure locales
 
-# Molly-Guard : prevent accidental shutdowns
-- include_tasks: molly-guard.yml
-
 # APT-List Changes : send email with changelog
 - include_tasks: apt-listchanges.yml
 
diff --git a/roles/baseconfig/tasks/molly-guard.yml b/roles/baseconfig/tasks/molly-guard.yml
deleted file mode 100644
index b444b73..0000000
--- a/roles/baseconfig/tasks/molly-guard.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Install molly-guard
-- name: Install molly-guard
-  when: ansible_os_family == "Debian"
-  apt:
-    name: molly-guard
-    state: present
-    update_cache: true
-  register: apt_result
-  retries: 3
-  until: apt_result is succeeded
-
-# Always ask for hostname
-- name: Configure molly-guard
-  lineinfile:
-    dest: /etc/molly-guard/rc
-    regexp: '^#*\s*ALWAYS_QUERY_HOSTNAME.*$'
-    line: 'ALWAYS_QUERY_HOSTNAME=true'