From ed2fe7106e3d61b7c05a9d9a5a6aa579ad3e946a Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:30 -0400
Subject: [PATCH] Fix support for bookworm

---
 roles/base/tasks/main.yml                          |  6 +++---
 .../etc/apt/sources.list.x86_64.bookworm.j2        | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 roles/base/templates/etc/apt/sources.list.x86_64.bookworm.j2

diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index f300b13..321b473 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -177,14 +177,14 @@
   apt:
     name:
       - python
-  when: debian_codename == 'buster'
+  when: debian_version|int <= 10
   tags: base-packages
 
-- name: install common packages (bullseye)
+- name: install common packages (bullseye+)
   apt:
     name:
       - python-is-python3
-  when: debian_codename == 'bullseye'
+  when: debian_version|int >= 11
   tags: base-packages
 
 - name: install common packages (all versions)
diff --git a/roles/base/templates/etc/apt/sources.list.x86_64.bookworm.j2 b/roles/base/templates/etc/apt/sources.list.x86_64.bookworm.j2
new file mode 100644
index 0000000..d9a5244
--- /dev/null
+++ b/roles/base/templates/etc/apt/sources.list.x86_64.bookworm.j2
@@ -0,0 +1,14 @@
+# apt configuration: main sources list
+# {{ ansible_managed }}
+
+deb {{ debian_main_repository }} bookworm main contrib non-free
+deb-src {{ debian_main_repository }} bookworm main contrib
+
+deb {{ debian_security_repository }} bookworm-security main contrib
+deb-src {{ debian_security_repository }} bookworm-security main contrib
+
+deb {{ debian_main_repository }} bookworm-updates main contrib
+deb-src {{ debian_main_repository }} bookworm-updates main contrib
+
+deb {{ debian_pvc_repository }} bookworm pvc
+deb-src {{ debian_pvc_repository }} bookworm pvc