From fe17fb6ae6a7cec6a04d6f2519e4db7644ee1436 Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 17 Jun 2023 15:38:43 +0200 Subject: [PATCH 1/7] add bookworm support --- defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 157c642..58aa8e9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ default_repos: debian: - bullseye: + bookworm: &debian_default_repos debian: url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free" update: @@ -9,6 +9,7 @@ default_repos: url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free" backports: url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main" + bullseye: *debian_default_repos buster: debian: url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free" From 64e84c36b26828ec58a294fd1f9ac2f1f6f1c1aa Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 17 Jun 2023 15:57:07 +0200 Subject: [PATCH 2/7] added bookworm packages --- defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4193f38..113f603 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -25,7 +25,7 @@ default_repos: default_packages: debian: - bullseye: &debian_packages + bookworm: &debian_packages aptitude: {} "apt-transport-https": {} "libarchive-tools": {} @@ -69,4 +69,5 @@ default_packages: "xz-utils": {} zip: {} zsh: {} + bullseye: *debian_packages buster: *debian_packages From c19e01d2449af5f62aad98257d090d21bbf4d785 Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 17 Jun 2023 20:32:06 +0200 Subject: [PATCH 3/7] realy fix bookworm repos --- defaults/main.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 113f603..20d736e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,15 @@ default_repos: debian: bookworm: &debian_default_repos + debian: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free non-free-firmware" + update: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-updates main contrib non-free non-free-firmware" + security: + url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free non-free-firmware" + backports: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free non-free-firmware" + bullseye: debian: url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free" update: @@ -9,7 +18,6 @@ default_repos: url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free" backports: url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" - bullseye: *debian_default_repos buster: debian: url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free" From 540ccdb8774f927d89193fc3ecda8955f1e573ca Mon Sep 17 00:00:00 2001 From: Julian Rother Date: Wed, 11 Oct 2023 23:55:58 +0200 Subject: [PATCH 4/7] Add repos/packages for Bookworm --- defaults/main.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5ce8d9d..1c6b24c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,14 @@ default_repos: debian: + bookworm: + debian: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free" + update: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-updates main contrib non-free" + security: + url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free" + backports: + url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" bullseye: debian: url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free" @@ -19,12 +28,13 @@ default_repos: backports: url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" raspbian: + bookworm: {} bullseye: {} buster: {} default_packages: debian: - bullseye: &debian_packages + bookworm: &debian_packages aptitude: {} "apt-transport-https": {} "libarchive-tools": {} @@ -68,4 +78,5 @@ default_packages: "xz-utils": {} zip: {} zsh: {} + bullseye: *debian_packages buster: *debian_packages From 1ed3ab7e238154b30780b32b035fbe2d4092b21b Mon Sep 17 00:00:00 2001 From: nd Date: Fri, 8 Mar 2024 13:43:49 +0100 Subject: [PATCH 5/7] fix raspbian bookworm --- defaults/main.yml | 10 +++++++++- tasks/main.yml | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4a37755..0969bfe 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -28,7 +28,11 @@ default_repos: backports: url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free" raspbian: - bookworm: {} + bookworm: + raspbian: + url: "deb http://raspbian.raspberrypi.org/raspbian/ {{ ansible_distribution_release|lower }} main contrib non-free rpi" + debian: + url: "deb http://archive.raspberrypi.org/debian/ {{ ansible_distribution_release|lower }} main non-free" bullseye: {} buster: {} @@ -80,3 +84,7 @@ default_packages: zsh: {} bullseye: *debian_packages buster: *debian_packages + raspbian: + bookworm: *debian_packages + bullseye: *debian_packages + buster: *debian_packages diff --git a/tasks/main.yml b/tasks/main.yml index 8957ada..a44023c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,11 +1,14 @@ --- +- name: workaround for raspbian naming + set_fact: + package_distro: "{% if ansible_lsb.id == 'Raspbian' %}raspbian{% else %}{{ ansible_distribution|lower }}{% endif %}" - name: install default packages and repos include_role: name: packages vars: packages: - pkg: "{{ default_packages[ansible_distribution|lower][ansible_distribution_release|lower] }}" - repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}" + pkg: "{{ default_packages[package_distro][ansible_distribution_release|lower] }}" + repos: "{{ default_repos[package_distro][ansible_distribution_release|lower] }}" - name: copy environment copy: From 2534a45ab2a4361a792297947fd21292cc875ba9 Mon Sep 17 00:00:00 2001 From: nd Date: Sun, 24 Mar 2024 00:35:58 +0100 Subject: [PATCH 6/7] workaround id not always being set in lsb_release --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index a44023c..57103b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: workaround for raspbian naming set_fact: - package_distro: "{% if ansible_lsb.id == 'Raspbian' %}raspbian{% else %}{{ ansible_distribution|lower }}{% endif %}" + package_distro: "{% if ansible_lsb.id|d('') == 'Raspbian' %}raspbian{% else %}{{ ansible_distribution|lower }}{% endif %}" - name: install default packages and repos include_role: name: packages From f7f3695fdc6126be93b7cf9540cca186c40bf8e5 Mon Sep 17 00:00:00 2001 From: nd Date: Mon, 10 Jun 2024 12:50:41 +0200 Subject: [PATCH 7/7] do not deleted sources list --- tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 57103b3..c8174cf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -49,6 +49,6 @@ path: /usr/bin/vim.basic - name: remove /etc/apt/sources.list - file: - path: /etc/apt/sources.list - state: absent + copy: + dest: /etc/apt/sources.list + content: "# managed by ansible\n"