added hostname vars, fixed some hosts ipv6 stuff

single file with lsb release parameter now

debian-to-pbs.yml

@@ -11,10 +11,9 @@
       when: ansible_facts["lsb"]["codename"] == "bullseye"
     - import_tasks: tasks/debian-general/repositories-bookworm.yml
       when: ansible_facts["lsb"]["codename"] == "bookworm"
+    - import_tasks: tasks/debian-general/repositories-trixie.yml
+      when: ansible_facts["lsb"]["codename"] == "trixie"
     - import_tasks: tasks/debian-general/upgrade.yml
-    - import_tasks: tasks/debian-to-pbs/repositories-bullseye.yml
-      when: ansible_facts["lsb"]["codename"] == "bullseye"
-    - import_tasks: tasks/debian-to-pbs/repositories-bookworm.yml
-      when: ansible_facts["lsb"]["codename"] == "bookworm"
+    - import_tasks: tasks/debian-to-pbs/repositories.yml
     - import_tasks: tasks/debian-general/upgrade.yml
     - import_tasks: tasks/debian-to-pbs/pbs-server.yml

debian-to-pve.yml

@@ -11,5 +11,7 @@
       when: ansible_facts.lsb.codename == "bullseye"
     - import_tasks: tasks/debian-general/repositories-bookworm.yml
       when: ansible_facts.lsb.codename == "bookworm"
+    - import_tasks: tasks/debian-general/repositories-trixie.yml
+      when: ansible_facts.lsb.codename == "trixie"
     - import_tasks: tasks/debian-to-pve/repositories.yml
     - import_tasks: tasks/debian-to-pve/pve-server.yml

powerdns-mysql.yml

@@ -2,4 +2,4 @@
 - hosts: all
   become: true
   tasks:
-    - import_tasks: tasks/powerdns-bullseye/powerdns-backend-mysql.yml
+    - import_tasks: tasks/powerdns/powerdns-backend-mysql.yml

powerdns.yml

@@ -8,10 +8,10 @@
       when: ansible_facts["lsb"]["codename"] == "bookworm"
     - import_tasks: tasks/debian-general/upgrade.yml
     - import_tasks: tasks/debian-general/gnupg2.yml
-    - import_tasks: tasks/powerdns-bullseye/gpg-key.yml
-    - import_tasks: tasks/powerdns-bullseye/repositories-authoritative-bullseye.yml
+    - import_tasks: tasks/powerdns/gpg-key.yml
+    - import_tasks: tasks/powerdns/repositories-authoritative-bullseye.yml
       when: ansible_facts["lsb"]["codename"] == "bullseye"
-    - import_tasks: tasks/powerdns-bullseye/repositories-authoritative-bookworm.yml
+    - import_tasks: tasks/powerdns/repositories-authoritative-bookworm.yml
       when: ansible_facts["lsb"]["codename"] == "bookworm"
     - import_tasks: tasks/debian-general/upgrade.yml
-    - import_tasks: tasks/powerdns-bullseye/powerdns-authoritative.yml
+    - import_tasks: tasks/powerdns/powerdns-authoritative.yml

tasks/debian-general/hosts-file.yml

@@ -5,4 +5,6 @@
     content: |
       127.0.0.1    localhost.localdomain localhost
       ::1          localhost.localdomain localhost
+      ff02::1      ip6-allnodes
+      ff02::2      ip6-allrouters
       {{ PUBLIC_IP }}    {{ HOSTNAME }} {{ HOSTNAME_SHORT }}

tasks/debian-general/repositories-trixie.yml

@@ -0,0 +1,8 @@
+---
+- name: (Trixie) Ensure the correct Debian repositories are in place
+  ansible.builtin.copy:
+    dest: /etc/apt/sources.list
+    content: |
+      deb http://deb.debian.org/debian               trixie          main contrib non-free-firmware
+      deb http://deb.debian.org/debian               trixie-updates  main contrib non-free-firmware
+      deb http://security.debian.org/debian-security trixie-security main contrib non-free-firmware

tasks/debian-to-pbs/repositories-bookworm.yml

@@ -1,15 +0,0 @@
----
-- name: Ensure the PBS Enterprise respository is disabled
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-enterprise.list
-    content: |
-      #deb https://enterprise.proxmox.com/debian/pbs bookworm pbs-enterprise
-- name: Ensure the correct Proxmox repositories are in place
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
-    content: |
-      deb http://download.proxmox.com/debian/pbs bookworm pbs-no-subscription
-- name: Ensure the Proxmox signing GPG key is present
-  ansible.builtin.get_url:
-    dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    url: https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg

tasks/debian-to-pbs/repositories-bullseye.yml

@@ -1,15 +0,0 @@
----
-- name: Ensure the PBS Enterprise respository is disabled
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-enterprise.list
-    content: |
-      #deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
-- name: Ensure the correct Proxmox repositories are in place
-  ansible.builtin.copy:
-    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
-    content: |
-      deb http://download.proxmox.com/debian/pbs bullseye pbs-no-subscription
-- name: Ensure the Proxmox signing GPG key is present
-  ansible.builtin.get_url:
-    dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg

tasks/debian-to-pbs/repositories.yml

@@ -0,0 +1,15 @@
+---
+- name: Ensure the PBS Enterprise repository is disabled
+  ansible.builtin.copy:
+    dest: /etc/apt/sources.list.d/pbs-enterprise.list
+    content: |
+      #deb https://enterprise.proxmox.com/debian/pbs {{ ansible_facts.lsb.codename }} pbs-enterprise
+- name: Ensure the correct Proxmox repositories are in place
+  ansible.builtin.copy:
+    dest: /etc/apt/sources.list.d/pbs-no-subscription.list
+    content: |
+      deb http://download.proxmox.com/debian/pbs {{ ansible_facts.lsb.codename }} pbs-no-subscription
+- name: Ensure the Proxmox signing GPG key is present
+  ansible.builtin.get_url:
+    dest: /etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_facts.lsb.codename }}.gpg
+    url: https://enterprise.proxmox.com/debian/proxmox-release-{{ ansible_facts.lsb.codename }}.gpg

upgrade-debian.yml

@@ -6,4 +6,6 @@
       when: ansible_facts["lsb"]["codename"] == "bullseye"
     - import_tasks: tasks/debian-general/repositories-bookworm.yml
       when: ansible_facts["lsb"]["codename"] == "bookworm"
+    - import_tasks: tasks/debian-general/repositories-trixie.yml
+      when: ansible_facts.lsb.codename == "trixie"
     - import_tasks: tasks/debian-general/upgrade.yml

vars/hostname.yml

@@ -0,0 +1,4 @@
+---
+HOSTNAME: z2m.home.infra.bjphoster.cloud
+HOSTNAME_SHORt: z2m
+PUBLIC_IP: 10.31.0.100