From 61617ad70e5cc09000f7ee3085f82c4d30b68fb3 Mon Sep 17 00:00:00 2001
From: Matej Focko <me@mfocko.xyz>
Date: Sun, 29 Dec 2024 17:50:31 +0100
Subject: [PATCH] fix(os_deb): install additional repos in new format

Signed-off-by: Matej Focko <me@mfocko.xyz>
---
 roles/os_deb/tasks/repositories.yml | 42 ++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/roles/os_deb/tasks/repositories.yml b/roles/os_deb/tasks/repositories.yml
index 545ae2b..9827d81 100644
--- a/roles/os_deb/tasks/repositories.yml
+++ b/roles/os_deb/tasks/repositories.yml
@@ -5,14 +5,38 @@
     regexp: "^deb cdrom:"
     state: absent
 
-- name: Enable additional repository
-  ansible.builtin.apt_repository:
-    repo: "{{ item }}"
+- name: Enable additional Debian repos
+  ansible.builtin.deb822_repository:
+    name: "{{ item.name }}"
+    types: "{{ item.types }}"
+    uris: "{{ item.uris }}"
+    suites: "{{ item.suites }}"
+    components:
+      - contrib
+      - non-free
     state: present
   loop:
-    - deb http://ftp.sk.debian.org/debian/ {{ ansible_facts.distribution_release }} contrib non-free
-    - deb-src http://ftp.sk.debian.org/debian/ {{ ansible_facts.distribution_release }} contrib non-free
-    - deb http://security.debian.org/debian-security {{ ansible_facts.distribution_release }}-security contrib non-free
-    - deb-src http://security.debian.org/debian-security {{ ansible_facts.distribution_release }}-security contrib non-free
-    - deb http://ftp.sk.debian.org/debian/ {{ ansible_facts.distribution_release }}-updates contrib non-free
-    - deb-src http://ftp.sk.debian.org/debian/ {{ ansible_facts.distribution_release }}-updates contrib non-free
+    - name: deb-contrib-non_free
+      types: deb
+      uris: http://ftp.sk.debian.org/debian/
+      suites: "{{ ansible_facts.distribution_release }}"
+    - name: deb_src-contrib-non_free
+      types: deb-src
+      uris: http://ftp.sk.debian.org/debian/
+      suites: "{{ ansible_facts.distribution_release }}"
+    - name: deb-security-contrib-non_free
+      types: deb
+      uris: http://security.debian.org/debian-security
+      suites: "{{ ansible_facts.distribution_release }}-security"
+    - name: deb_src-security-contrib-non_free
+      types: deb-src
+      uris: http://security.debian.org/debian-security
+      suites: "{{ ansible_facts.distribution_release }}-security"
+    - name: deb-updates-contrib-non_free
+      types: deb
+      uris: http://ftp.sk.debian.org/debian/
+      suites: "{{ ansible_facts.distribution_release }}-updates"
+    - name: deb_src-updates-contrib-non_free
+      types: deb-src
+      uris: http://ftp.sk.debian.org/debian/
+      suites: "{{ ansible_facts.distribution_release }}-updates"