From c825925d7cea646c161e47888a983581b5d76aba Mon Sep 17 00:00:00 2001
From: "pulsar89.5" <pulsar89.5@ykn.fr>
Date: Fri, 24 May 2024 12:44:01 +0200
Subject: [PATCH] feat: Use deb822 format for sources

---
 defaults/main.yml                 |  2 +-
 tasks/configuration.yml           | 17 +++++++++++++++--
 templates/debian-bookworm.list.j2 |  6 ------
 templates/debian-bullseye.list.j2 |  6 ------
 templates/debian-sid.list.j2      |  3 ---
 templates/debian.sources.list.j2  | 21 +++++++++++++++++++++
 6 files changed, 37 insertions(+), 18 deletions(-)
 delete mode 100644 templates/debian-bookworm.list.j2
 delete mode 100644 templates/debian-bullseye.list.j2
 delete mode 100644 templates/debian-sid.list.j2
 create mode 100644 templates/debian.sources.list.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index a5b39d1..dd17733 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,7 +2,7 @@
 # defaults file for apt
 
 apt_distribution_name: debian
-apt_distribution_release: bullseye
+apt_distribution_release: bookworm
 apt_distribution_sections: main
 
 apt_repositories: []
diff --git a/tasks/configuration.yml b/tasks/configuration.yml
index a885656..c0b135f 100644
--- a/tasks/configuration.yml
+++ b/tasks/configuration.yml
@@ -11,10 +11,23 @@
   become: true
   notify: Mettre à jour le cache
 
+- name: Nettoyer le fichier de base
+  ansible.builtin.file:
+    path: /etc/apt/sources.list
+    state: absent
+  become: true
+  notify: Mettre à jour le cache
+
+- name: Supprimer le mirroirs
+  ansible.builtin.file:
+    path: /etc/apt/mirrors
+    state: absent
+  become: true
+
 - name: Déployer la configuration des sources
   ansible.builtin.template:
-    src: "{{ apt_distribution_name }}-{{ apt_distribution_release }}.list.j2"
-    dest: /etc/apt/sources.list
+    src: debian.sources.list.j2
+    dest: /etc/apt/sources.list.d/debian.sources
     owner: root
     group: root
     mode: u=rw,g=r,o=r
diff --git a/templates/debian-bookworm.list.j2 b/templates/debian-bookworm.list.j2
deleted file mode 100644
index 5a1041f..0000000
--- a/templates/debian-bookworm.list.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# {{ ansible_managed }}
-
-deb http://deb.debian.org/debian {{ apt_distribution_release }} {{ apt_distribution_sections }}
-deb http://security.debian.org/debian-security {{ apt_distribution_release }}-security {{ apt_distribution_sections }}
-deb http://deb.debian.org/debian {{ apt_distribution_release }}-updates {{ apt_distribution_sections }}
-deb https://deb.debian.org/debian/ {{ apt_distribution_release }}-backports {{ apt_distribution_sections }}
diff --git a/templates/debian-bullseye.list.j2 b/templates/debian-bullseye.list.j2
deleted file mode 100644
index 5a1041f..0000000
--- a/templates/debian-bullseye.list.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# {{ ansible_managed }}
-
-deb http://deb.debian.org/debian {{ apt_distribution_release }} {{ apt_distribution_sections }}
-deb http://security.debian.org/debian-security {{ apt_distribution_release }}-security {{ apt_distribution_sections }}
-deb http://deb.debian.org/debian {{ apt_distribution_release }}-updates {{ apt_distribution_sections }}
-deb https://deb.debian.org/debian/ {{ apt_distribution_release }}-backports {{ apt_distribution_sections }}
diff --git a/templates/debian-sid.list.j2 b/templates/debian-sid.list.j2
deleted file mode 100644
index eb9e56a..0000000
--- a/templates/debian-sid.list.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-deb http://deb.debian.org/debian {{ apt_distribution_release }} {{ apt_distribution_sections }}
diff --git a/templates/debian.sources.list.j2 b/templates/debian.sources.list.j2
new file mode 100644
index 0000000..fc422df
--- /dev/null
+++ b/templates/debian.sources.list.j2
@@ -0,0 +1,21 @@
+# {{ ansible_managed }}
+
+{% if apt_distribution_release == "sid" %}
+Types: deb
+URIs: https://deb.debian.org/debian
+Suites: {{ apt_distribution_release }} {{ apt_distribution_release }}-updates {{ apt_distribution_release }}-backports
+Components: {{ apt_distribution_sections }}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+{% else %}
+Types: deb
+URIs: https://deb.debian.org/debian
+Suites: {{ apt_distribution_release }} {{ apt_distribution_release }}-updates {{ apt_distribution_release }}-backports
+Components: {{ apt_distribution_sections }}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb
+URIs: http://security.debian.org/debian-security
+Suites: {{ apt_distribution_release }}-security
+Components: {{ apt_distribution_sections }}
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+{% endif %}