From 3cbbf4c80c97f44ce42cec00979a216d0f937c46 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Fri, 14 Jan 2022 17:22:26 +0100
Subject: [PATCH] [constellation] Django 3.2 is available in bullseye-backports

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 roles/constellation/tasks/main.yml               |  9 +++------
 .../apt/preferences.d/django-experimental.j2     | 16 ----------------
 .../sources.list.d/bullseye-backports.list.j2    |  3 +++
 .../apt/sources.list.d/experimental.list.j2      |  3 ---
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 roles/constellation/templates/apt/preferences.d/django-experimental.j2
 create mode 100644 roles/constellation/templates/apt/sources.list.d/bullseye-backports.list.j2
 delete mode 100644 roles/constellation/templates/apt/sources.list.d/experimental.list.j2

diff --git a/roles/constellation/tasks/main.yml b/roles/constellation/tasks/main.yml
index 304b765f..923b4119 100644
--- a/roles/constellation/tasks/main.yml
+++ b/roles/constellation/tasks/main.yml
@@ -1,11 +1,8 @@
 ---
-- name: Pin Django from Debian experimental until bullseye-backports exists
+- name: Pin Django from Debian bullseye-backports
   template:
-    src: "apt/{{ item }}.j2"
-    dest: "/etc/apt/{{ item }}"
-  loop:
-    - sources.list.d/experimental.list
-    - preferences.d/django-experimental
+    src: "apt/sources.list.d/bullseye-backports.list.j2"
+    dest: "/etc/apt/sources.list.d/bullseye-backports.list"
 
 - name: Install constellation dependencies
   apt:
diff --git a/roles/constellation/templates/apt/preferences.d/django-experimental.j2 b/roles/constellation/templates/apt/preferences.d/django-experimental.j2
deleted file mode 100644
index 07050664..00000000
--- a/roles/constellation/templates/apt/preferences.d/django-experimental.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-{{ ansible_header | comment }}
-
-
-Package: *
-Pin: release n=experimental
-Pin-Priority: 1
-
-
-Package: python3-django
-Pin: release n=experimental
-Pin-Priority: 900
-
-
-Package: python3-django-tables2
-Pin: release n=experimental
-Pin-Priority: 900
diff --git a/roles/constellation/templates/apt/sources.list.d/bullseye-backports.list.j2 b/roles/constellation/templates/apt/sources.list.d/bullseye-backports.list.j2
new file mode 100644
index 00000000..e231539d
--- /dev/null
+++ b/roles/constellation/templates/apt/sources.list.d/bullseye-backports.list.j2
@@ -0,0 +1,3 @@
+{{ ansible_header | comment }}
+
+deb {{ debian_mirror }} bullseye-backports main
diff --git a/roles/constellation/templates/apt/sources.list.d/experimental.list.j2 b/roles/constellation/templates/apt/sources.list.d/experimental.list.j2
deleted file mode 100644
index e645773f..00000000
--- a/roles/constellation/templates/apt/sources.list.d/experimental.list.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ ansible_header | comment }}
-
-deb {{ debian_mirror }} experimental main