From e09a6ace319fd0479b434d09d09d042bfcfee108 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 10 Oct 2017 16:35:23 +0200
Subject: [PATCH] evolinux-base: use apt role for all APT configuration

---
 evolinux-base/tasks/apt.yml  | 51 ------------------------------------
 evolinux-base/tasks/main.yml |  6 ++++-
 2 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 evolinux-base/tasks/apt.yml

diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml
deleted file mode 100644
index 03781a8b..00000000
--- a/evolinux-base/tasks/apt.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-
-- include_role:
-    name: apt
-  vars:
-    apt_install_basics: "{{ evolinux_apt_replace_default_sources }}"
-    apt_install_evolix_public: "{{ evolinux_apt_public_sources }}"
-
-- name: Setting apt config
-  lineinfile:
-    dest: /etc/apt/apt.conf.d/z-evolinux.conf
-    line: "{{ item }}"
-    create: yes
-    state: present
-    mode: "0640"
-  with_items:
-  - "APT::Install-Recommends \"false\";"
-  - "APT::Install-Suggests \"false\";"
-  when: evolinux_apt_conf
-
-- name: DPKG invoke hooks
-  lineinfile:
-    dest: /etc/apt/apt.conf.d/z-evolinux.conf
-    line: "{{ item }}"
-    create: yes
-    state: present
-    mode: "0640"
-  with_items:
-  - "DPkg::Pre-Invoke { \"df /tmp | grep -q /tmp && mount -oremount,exec /tmp || true\"; };"
-  - "DPkg::Pre-Invoke { \"df /usr | grep -q /usr && mount -oremount,rw /usr || true\"; };"
-  - "DPkg::Post-Invoke { \"df /tmp | grep -q /tmp && mount -oremount /tmp || true\"; };"
-  - "DPkg::Post-Invoke { \"df /usr | grep -q /usr && mount -oremount /usr || true\"; };"
-  when: evolinux_apt_hooks
-
-- name: Remove Aptitude
-  apt:
-    name: aptitude
-    state: absent
-  when: evolinux_apt_remove_aptitude
-
-- name: Updating APT cache
-  apt:
-    update_cache: yes
-  changed_when: False
-
-- name: Upgrading system
-  apt:
-    upgrade: dist
-  when: evolinux_apt_upgrade
-
-- meta: flush_handlers
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index 09321bab..bb2d56a5 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -6,7 +6,11 @@
   - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
 
 - name: Apt configuration
-  include: apt.yml
+  include_role:
+    name: apt
+  vars:
+    apt_install_basics: "{{ evolinux_apt_replace_default_sources }}"
+    apt_install_evolix_public: "{{ evolinux_apt_public_sources }}"
   when: evolinux_apt_include
 
 - name: /etc versioning with Git