From a1c69bdf84f97c5dce03ab57975be5198c93895f Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 5 Jun 2017 11:43:25 +0200
Subject: [PATCH] apt-repositories/evolinux-base: fix default sources.list
 configuration

---
 apt-repositories/defaults/main.yml            |  2 +-
 apt-repositories/tasks/basics_components.yml  | 13 +++------
 apt-repositories/tasks/main.yml               |  8 ++++++
 .../templates/basics_components.list.j2       |  3 +++
 evolinux-base/defaults/main.yml               |  5 ----
 evolinux-base/tasks/apt.yml                   | 27 -------------------
 6 files changed, 16 insertions(+), 42 deletions(-)
 create mode 100644 apt-repositories/templates/basics_components.list.j2

diff --git a/apt-repositories/defaults/main.yml b/apt-repositories/defaults/main.yml
index e5b42f4a..08a79106 100644
--- a/apt-repositories/defaults/main.yml
+++ b/apt-repositories/defaults/main.yml
@@ -1,4 +1,4 @@
-apt_repositories_change_basics_components: False
+apt_repositories_change_basics_components: True
 apt_repositories_basics_components: "main"
 
 apt_repositories_install_backports: False
diff --git a/apt-repositories/tasks/basics_components.yml b/apt-repositories/tasks/basics_components.yml
index c7356b6d..681744e3 100644
--- a/apt-repositories/tasks/basics_components.yml
+++ b/apt-repositories/tasks/basics_components.yml
@@ -1,16 +1,11 @@
 ---
 
 - name: Change basic repositories components
-  replace:
+  template:
+    src: basics_components.list.j2
     dest: /etc/apt/sources.list
-    regexp: '^({{ item }}) .*'
-    replace: '\1 {{ apt_repositories_basics_components }}'
-  with_items:
-  - 'deb(-src)? http://security.debian.org/? {{ ansible_distribution_release }}/updates'
-  - 'deb(-src)? http://\w+.debian.org/debian/? {{ ansible_distribution_release }}'
-  - 'deb(-src)? http://\w+.debian.org/debian/? {{ ansible_distribution_release }}-updates'
-  - 'deb(-src)? http://mirror.evolix.org/debian/? {{ ansible_distribution_release }}'
-  - 'deb(-src)? http://mirror.evolix.org/debian/? {{ ansible_distribution_release }}-updates'
+    mode: "0644"
+    backup: yes
   notify: apt update
 
 - name: Intermediate flush of handlers
diff --git a/apt-repositories/tasks/main.yml b/apt-repositories/tasks/main.yml
index d6bfb9e3..f1d52df1 100644
--- a/apt-repositories/tasks/main.yml
+++ b/apt-repositories/tasks/main.yml
@@ -6,15 +6,23 @@
   when:
   - ansible_distribution_release != "jessie"
   - ansible_distribution_release != "stretch"
+  tags:
+  - apt-repository
 
 - name: Add components to basic repositories
   include: basics_components.yml
   when: apt_repositories_change_basics_components
+  tags:
+  - apt-repository
 
 - name: Install APT Backports repository
   include: backports.yml
   when: apt_repositories_install_backports
+  tags:
+  - apt-repository
 
 - name: Install Evolix Public APT repository
   include: evolix_public.yml
   when: apt_repositories_install_evolix_public
+  tags:
+  - apt-repository
diff --git a/apt-repositories/templates/basics_components.list.j2 b/apt-repositories/templates/basics_components.list.j2
new file mode 100644
index 00000000..8f03a622
--- /dev/null
+++ b/apt-repositories/templates/basics_components.list.j2
@@ -0,0 +1,3 @@
+deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} {{ apt_repositories_basics_components | mandatory }}
+deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ apt_repositories_basics_components | mandatory }}
+deb http://security.debian.org/ {{ ansible_distribution_release }}/updates {{ apt_repositories_basics_components | mandatory }}
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 5a378ba6..2d602077 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -37,15 +37,10 @@ evolinux_apt_include: True
 
 evolinux_apt_conf: True
 evolinux_apt_hooks: True
-evolinux_apt_disable_originals: True
-evolinux_apt_disable_debsrc: True
-evolinux_apt_basic_sources: True
 evolinux_apt_public_sources: True
 evolinux_apt_upgrade: True
 evolinux_apt_remove_aptitude: True
 
-evolinux_apt_repositories_components: "main"
-
 # fstab
 
 evolinux_fstab_include: True
diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml
index bdf5b601..8d865be0 100644
--- a/evolinux-base/tasks/apt.yml
+++ b/evolinux-base/tasks/apt.yml
@@ -27,33 +27,6 @@
   - "DPkg::Post-Invoke { \"mount -oremount /tmp && mount -oremount /usr || exit 0\"; };"
   when: evolinux_apt_hooks
 
-- name: Original repositories are disabled
-  replace:
-    dest: /etc/apt/sources.list
-    regexp:  '^(deb(-src)? {{ item }}.+)'
-    replace: '# \1'
-  with_items:
-  # - '.+\.debian\.org'
-  - 'cdrom:'
-  when: evolinux_apt_disable_originals
-
-- name: deb-src repositories are disabled
-  replace:
-    dest: /etc/apt/sources.list
-    regexp:  '^(deb-src.+)'
-    replace: '# \1'
-  when: evolinux_apt_disable_debsrc
-
-- name: Basic sources list is installed
-  lineinfile:
-    dest: /etc/apt/sources.list
-    line: "{{ item }}"
-  with_items:
-  - "deb http://security.debian.org/ {{ ansible_distribution_release }}/updates {{ evolinux_apt_repositories_components | mandatory }}"
-  - "deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} {{ evolinux_apt_repositories_components | mandatory }}"
-  - "deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ evolinux_apt_repositories_components | mandatory }}"
-  when: evolinux_apt_basic_sources
-
 - name: Remove Aptitude
   apt:
     name: aptitude