diff --git a/roles/irker/tasks/main.yml b/roles/irker/tasks/main.yml index def713264fac7b3ba0d805de911537087a8a7991..f8c18b1802d586a1ae564f81325da4429ef603ed 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 0fd1f458e01d35759e03a495d2327309527f350c..01496af4e291d8d1634e0efc5272d92bd39fbc57 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 0000000000000000000000000000000000000000..b0c68f3c0b5b4142354636e5196bdfdbe7d22297 --- /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 346a18cdac3f2cf492170d039699c0db610968a9..0000000000000000000000000000000000000000 --- 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