From 609a3410450fca1b3009ac34faeb56a887d4235f Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Mon, 24 Jul 2023 15:23:49 -0700
Subject: [PATCH] Deal with changing package names.

---
 tasks/main.yml     | 13 ++-----------
 vars/Debian-12.yml | 20 ++++++++++++++++++++
 vars/Debian.yml    |  2 +-
 vars/default.yml   | 18 ++++++++++++++++++
 4 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 vars/Debian-12.yml
 create mode 100644 vars/default.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 99af068..94f7b33 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,20 +1,11 @@
 ---
-- import_tasks: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- import_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- import_tasks: setup-Arch.yml
-  when: ansible_os_family == 'Archlinux'
-
 - name: Load a variable file based on the OS type, or a default if not found.
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
-    - "Debian.yml"
+    - "default.yml"
 
 - name: Ensure sysadmin utility packages are installed.
   ansible.builtin.package:
diff --git a/vars/Debian-12.yml b/vars/Debian-12.yml
new file mode 100644
index 0000000..a913214
--- /dev/null
+++ b/vars/Debian-12.yml
@@ -0,0 +1,20 @@
+---
+sysadmin_packages:
+  - curl
+  - file
+  - dnsutils
+  - git
+  - gpg
+  - htop
+  - nftables
+  - iputils-ping
+  - jq
+  - net-tools
+  - netcat-traditional
+  - psmisc
+  - python-is-python3
+  - rsync
+  - tcpdump
+  - tmux
+  - tree
+  - vim
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 2b86ef6..cf64259 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -6,7 +6,7 @@ sysadmin_packages:
   - git
   - gpg
   - htop
-# - iptables # replace with nftables
+# - iptables
   - iputils-ping
   - jq
   - net-tools
diff --git a/vars/default.yml b/vars/default.yml
new file mode 100644
index 0000000..6011136
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1,18 @@
+---
+sysadmin_packages:
+  - curl
+  - file
+  - dnsutils
+  - git
+  - gpg
+  - htop
+  - jq
+  - net-tools
+  - netcat
+  - psmisc
+  - python-is-python3
+  - rsync
+  - tcpdump
+  - tmux
+  - tree
+  - vim