From 1fef7fbc5701472ac3f1fa96b6cb5e4e3e0d9132 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sat, 24 Jul 2021 22:55:18 +0200
Subject: [PATCH 1/2] fixed mtr / mtr-tiny problem

---
 vars/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vars/main.yml b/vars/main.yml
index fc6e576..b850b62 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -21,7 +21,7 @@ packages:
     mksh: {}
     "molly-guard": {}
     mosh: {}
-    mtr: {}
+    "mtr-tiny": {}
     ncdu: {}
     "ncurses-term": {}
     "net-tools": {}
@@ -43,6 +43,8 @@ packages:
     "xz-utils": {}
     zsh: {}
   repos:
+    debian:
+      url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free"
     update:
       url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }}-updates main contrib non-free"
     security:

From 9c2fdaad308dc37ffacf86aec7599f83eb5456b7 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 5 Sep 2021 17:18:58 +0200
Subject: [PATCH 2/2] add support for debian bullseye

---
 defaults/main.yml | 22 ++++++++++++++++++++++
 vars/main.yml     | 15 ++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 defaults/main.yml

diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..157c642
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,22 @@
+default_repos:
+  debian:
+    bullseye:
+      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"
+    buster:
+      debian:
+        url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free"
+      update:
+        url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }}-updates main contrib non-free"
+      security:
+        url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free"
+      backports:
+        url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
+
+
diff --git a/vars/main.yml b/vars/main.yml
index b850b62..b84ed19 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,9 +1,8 @@
-
 packages:
   pkg:
     aptitude: {}
     "apt-transport-https": {}
-    bsdtar: {}
+    "libarchive-tools": {}
     bzip2: {}
     curl: {}
     dnsutils: {}
@@ -42,14 +41,4 @@ packages:
     vnstat: {}
     "xz-utils": {}
     zsh: {}
-  repos:
-    debian:
-      url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free"
-    update:
-      url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }}-updates main contrib non-free"
-    security:
-      url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free"
-#    backports:
-#      url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
-#      url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
-
+  repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"