fix: Deploy repositories

This reverts commit 5b871f1c48.

defaults/main.yml

@@ -2,16 +2,22 @@
 # defaults file for apt
 
 apt_distribution_name: debian
-apt_distribution_release: bullseye
+apt_distribution_release: bookworm
 apt_distribution_sections: main
 
 apt_repositories: []
 # Exemple:
-#   - name: incus
+#   - url: http://deb.debian.org/debian
-#     key: https://pkgs.zabbly.com/key.asc
+#     suites: sid
-#     url: https://pkgs.zabbly.com/incus/stable
+#     components: main
-#     distribution_release: bookworm
+#     key_path: /usr/share/keyrings/debian-archive-keyring.gpg
-#     distribution_section: main
+#   - url: https://pkgs.zabbly.com/incus/stable
+#     suites: bookworm
+#     components: main
+#     key_url: https://pkgs.zabbly.com/key.asc
+#     key_path: /etc/apt/keyrings/incus.asc
+
+apt_preferences: []
 
 apt_remove: []
 apt_install: []

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"
+    src: debian.sources.list.j2
-    dest: /etc/apt/sources.list
+    dest: /etc/apt/sources.list.d/debian.sources
     owner: root
     group: root
     mode: u=rw,g=r,o=r

tasks/main.yml

@@ -8,7 +8,11 @@
 - name: Importer les tâches d'ajout de dépôts tiers
   ansible.builtin.import_tasks:
     file: repositories.yml
-  when: apt_repositories | length > 0
+
+- name: Importer les tâches d'ajout des préférences
+  ansible.builtin.import_tasks:
+    file: preferences.yml
+  when: apt_preferences | length > 0
 
 - name: Exécuter les handlers
   meta: flush_handlers

tasks/preferences.yml

@@ -0,0 +1,24 @@
+---
+# tasks file for apt
+
+- name: Construire la liste des règles
+  ansible.builtin.set_fact:
+    nftables_rules: "{{ nftables_rules + specific }}"
+  when: specific | length > 0
+  loop: "{{ lookup('ansible.builtin.varnames', '^nftables_rules_.+', wantlist=True) }}"
+  vars:
+    specific: "{{ lookup('ansible.builtin.vars', item, default='') }}"
+
+- name: Ajouter le fichier de priorité
+  ansible.builtin.template:
+    src: preferences.j2
+    dest: /etc/apt/preferences.d/{{ item.name }}
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+  when: apt_preferences | length > 0
+  loop: "{{ apt_preferences }}"
+  loop_control:
+    label: "{{ item.name }}"
+  become: true
+  notify: Mettre à jour le cache

tasks/repositories.yml

@@ -1,11 +1,20 @@
 ---
 # tasks file for apt
 
+- name: Construire la liste des dépôts
+  ansible.builtin.set_fact:
+    apt_repositories: "{{ apt_repositories + specific }}"
+  when: specific | length > 0
+  loop: "{{ lookup('ansible.builtin.varnames', '^apt_repositories_.+', wantlist=True) }}"
+  vars:
+    specific: "{{ lookup('ansible.builtin.vars', item, default='') }}"
+
 - name: Télécharger la clef du dépôt
   ansible.builtin.get_url:
-    url: "{{ item.key }}"
+    url: "{{ item.key_url }}"
-    dest: "/etc/apt/keyrings/{{ item.name }}.asc"
+    dest: "{{ item.key_path }}"
     mode: u=rw,g=r,o=r
+  when: item.get('key_url', '') | length > 0
   become: true
   loop: "{{ apt_repositories }}"
   loop_control:
@@ -14,8 +23,8 @@
 
 - name: Ajouter le dépôt
   ansible.builtin.template:
-    src: repository.list.j2
+    src: repository.sources.j2
-    dest: /etc/apt/sources.list.d/{{ item.name }}.list
+    dest: /etc/apt/sources.list.d/{{ item.name }}.sources
     owner: root
     group: root
     mode: u=rw,g=r,o=r

templates/debian-bookworm.list.j2

@@ -1 +0,0 @@
-debian-stable.list.j2

templates/debian-bullseye.list.j2

@@ -1 +0,0 @@
-debian-stable.list.j2

templates/debian-sid.list.j2

@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-deb http://deb.debian.org/debian {{ apt_distribution_release }} {{ apt_distribution_sections }}

templates/debian-stable.list.j2

@@ -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 }}

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 }}
+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 %}

templates/preferences.j2

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+
+{% for item in apt_preferences %}
+Package: {{ item.package }}
+Pin: {{ item.pin }}
+Pin-Priority: {{ item.priority }}
+{% if not loop.last %}
+
+{% endif %}
+{% endfor %}

templates/repository.list.j2

@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-deb [signed-by=/etc/apt/keyrings/{{ item.name }}.asc] {{ item.url }} {{ item.distribution_release }} {{ item.distribution_section }}

templates/repository.sources.j2

@@ -0,0 +1,12 @@
+# {{ ansible_managed }}
+
+{% for item in apt_repositories %}
+Types: deb
+URIs: {{ item.url }}
+Suites: {{ item.suites }}
+Components: {{ item.components }}
+Signed-By: {{ item.key_path }}
+{% if not loop.last %}
+
+{% endif %}
+{% endfor %}