From 9dc0949b47f009c58dc3e7ad46280683f1011162 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sat, 5 Jun 2021 00:56:02 -0400
Subject: [PATCH] Add bullseye support

---
 roles/base/tasks/main.yml                           |  9 +--------
 .../etc/apt/sources.list.x86_64.bullseye.j2         | 13 +++++++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 roles/base/templates/etc/apt/sources.list.x86_64.bullseye.j2

diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 0206223..91f3f35 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -78,7 +78,7 @@
   with_items:
     - { src: "etc/apt/apt.conf.d/10norecommends.j2", dest: "/etc/apt/apt.conf.d/10norecommends" }
     - { src: "etc/apt/preferences.d/pins.j2", dest: "/etc/apt/preferences.d/pins" }
-    - { src: "etc/apt/sources.list.{{ ansible_machine }}.{{ ansible_distribution_release }}.j2", dest: "/etc/apt/sources.list" }
+    - { src: "etc/apt/sources.list.{{ ansible_machine }}.{{ ansible_lsb.codename }}.j2", dest: "/etc/apt/sources.list" }
   tags: base-apt
 
 - name: add key for bonilan repo
@@ -246,13 +246,6 @@
     loop_var: network
   tags: base-network
 
-# capabilities
-- name: set ping capabilities
-  capabilities:
-    path: /bin/ping
-    capability: cap_net_raw=ep
-  tags: base-system
-
 # locale
 - name: install locale config files
   template:
diff --git a/roles/base/templates/etc/apt/sources.list.x86_64.bullseye.j2 b/roles/base/templates/etc/apt/sources.list.x86_64.bullseye.j2
new file mode 100644
index 0000000..05819a0
--- /dev/null
+++ b/roles/base/templates/etc/apt/sources.list.x86_64.bullseye.j2
@@ -0,0 +1,13 @@
+# apt configuration: main sources list
+# {{ ansible_managed }}
+
+deb {{ debian_main_repository }} bullseye main contrib non-free
+deb-src {{ debian_main_repository }} bullseye main contrib
+
+deb {{ debian_security_repository }} bullseye-security main contrib
+deb-src {{ debian_security_repository }} bullseye-security main contrib
+
+deb {{ debian_main_repository }} bullseye-updates main contrib
+deb-src {{ debian_main_repository }} bullseye-updates main contrib
+
+deb {{ debian_pvc_repository }} bullseye main