From 4339fb96734d6efc41d372cc1ed3b8128be1df27 Mon Sep 17 00:00:00 2001
From: ynerant <ynerant@crans.org>
Date: Mon, 21 Jun 2021 12:47:52 +0000
Subject: [PATCH] [irker] Latest version of irker with Python 3 and TLSv1.3 is
now available on Bullseye
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
roles/irker/tasks/main.yml | 21 ++++++++++++++-----
.../{irker-sid.j2 => irker-bullseye.j2} | 4 ++--
.../apt/sources.list.d/bullseye.list.j2 | 3 +++
.../templates/apt/sources.list.d/sid.list.j2 | 3 ---
4 files changed, 21 insertions(+), 10 deletions(-)
rename roles/irker/templates/apt/preferences.d/{irker-sid.j2 => irker-bullseye.j2} (66%)
create mode 100644 roles/irker/templates/apt/sources.list.d/bullseye.list.j2
delete mode 100644 roles/irker/templates/apt/sources.list.d/sid.list.j2
diff --git a/roles/irker/tasks/main.yml b/roles/irker/tasks/main.yml
index def71326..f8c18b18 100644
--- a/roles/irker/tasks/main.yml
+++ b/roles/irker/tasks/main.yml
@@ -1,16 +1,27 @@
---
-- name: Pin irker from Debian unstable
+- name: Pin irker from Debian Bullseye
template:
src: "apt/{{ item }}.j2"
dest: "/etc/apt/{{ item }}"
loop:
- - sources.list.d/sid.list
- - preferences.d/irker-sid
+ - sources.list.d/bullseye.list
+ - preferences.d/irker-bullseye
when:
- ansible_distribution == "Debian"
- - ansible_distribution_major_version | int <= 11
- - ansible_distribution_release != "sid"
+ - ansible_distribution_major_version | int < 11
+ - ansible_distribution_release != "bullseye"
+- name: Don't pin irker if we are on bullseye
+ file:
+ path: "/etc/apt/{{ item }}"
+ state: absent
+ loop:
+ - sources.list.d/bullseye.list
+ - preferences.d/irker-bullseye
+ when:
+ - ansible_distribution == "Debian"
+ - ansible_distribution_major_version | int >= 11
+ - ansible_distribution_release == "bullseye"
- name: Install Irker for IRC support
apt:
diff --git a/roles/irker/templates/apt/preferences.d/irker-sid.j2 b/roles/irker/templates/apt/preferences.d/irker-bullseye.j2
similarity index 66%
rename from roles/irker/templates/apt/preferences.d/irker-sid.j2
rename to roles/irker/templates/apt/preferences.d/irker-bullseye.j2
index 0fd1f458..01496af4 100644
--- a/roles/irker/templates/apt/preferences.d/irker-sid.j2
+++ b/roles/irker/templates/apt/preferences.d/irker-bullseye.j2
@@ -2,11 +2,11 @@
Package: *
-Pin: release n=sid
+Pin: release n=bullseye
Pin-Priority: 1
Package: irker
-Pin: release n=sid
+Pin: release n=bullseye
Pin-Priority: 900
diff --git a/roles/irker/templates/apt/sources.list.d/bullseye.list.j2 b/roles/irker/templates/apt/sources.list.d/bullseye.list.j2
new file mode 100644
index 00000000..b0c68f3c
--- /dev/null
+++ b/roles/irker/templates/apt/sources.list.d/bullseye.list.j2
@@ -0,0 +1,3 @@
+{{ ansible_header | comment }}
+
+deb http://{{ mirror.hostname }}/debian bullseye main
diff --git a/roles/irker/templates/apt/sources.list.d/sid.list.j2 b/roles/irker/templates/apt/sources.list.d/sid.list.j2
deleted file mode 100644
index 346a18cd..00000000
--- a/roles/irker/templates/apt/sources.list.d/sid.list.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ ansible_header | comment }}
-
-deb http://{{ mirror.name }}/debian sid main
--
GitLab