upgraded a number of hosts to bookworm

5 files changed, 22 insertions, 23 deletions

diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index 5fa51964..f342445b 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -32,7 +32,7 @@ ssh_keys_root_extra:
 apt_repo_components:
   - main
   - contrib  ## for zfs
-  - non-free ## for microcode updates
+  - non-free-firmware
 
 spreadspace_apt_repo_components:
   - main
diff --git a/inventory/host_vars/ch-mcbr.yml b/inventory/host_vars/ch-mcbr.yml
index 6f7ae3c4..b781216d 100644
--- a/inventory/host_vars/ch-mcbr.yml
+++ b/inventory/host_vars/ch-mcbr.yml
@@ -34,6 +34,7 @@ base_modules_blacklist: "{{ base_modules_blacklist_none }}"
 apt_repo_components:
   - main
   - contrib
+  - non-free-firmware
   - non-free
 
 ntp_variant: systemd-timesyncd
@@ -42,7 +43,6 @@ ntp_variant: systemd-timesyncd
 kodi_standalone_support_packages_extra:
   - i965-va-driver-shaders
 
-kodi_standalone_use_backports: yes
 kodi_standalone_kodi_packages_extra:
   - kodi-repository-kodi
   - kodi-inputstream-adaptive
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 332ba8ef..88a4784f 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -37,11 +37,10 @@ network:
 apt_repo_components:
   - main
   - contrib  ## for zfs
-  - non-free ## for microcode updates
+  - non-free-firmware
 
 
 ssh_keys_root_extra:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9AkOBxvf1wZ0B3wEyf7O3GbaIGx5o2f6cVuQIrOjeFfgMSAr1LwiB/gmHhMSEq6OSauD37TA5yDIrzk6NPPjVs/wiklsHgYtTqIxSPItTZFPX4gLvNwwGuRvEW9bTEiHd+bVPIiIT7HOje0kgacjan44rdgppX9DgcUp2j7uSZZabsxDCS/ms0slhwBNU1gtR31PoQ56vIya23D2uMauNAbRJzDEOfAjy4pHF8njYcXPas/yrbLi8PUZ1YO1u/AZto96EIYfHaCLWlstqeCX+R2JrTunvfTr8TF3AkFw8lHMzk3neUR+tPAAFQaqeTlqGPiSNq1Oyf+52XR16qwhd equinox@mail
   - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
diff --git a/inventory/host_vars/ele-gwhetzner.yml b/inventory/host_vars/ele-gwhetzner.yml
index ea16146e..9cd236ef 100644
--- a/inventory/host_vars/ele-gwhetzner.yml
+++ b/inventory/host_vars/ele-gwhetzner.yml
@@ -59,24 +59,24 @@ wireguard_gateway_tunnels:
     - pub_key: "{{ hostvars['ele-media'].wireguard_keys.gwhetzner.pub }}"
       allowed_ips:
         - 192.168.254.2/32
-  wg-emc:
-    description: Elevate Media Channel
-    priv_key: "{{ wireguard_keys.emc.priv }}"
-    listen_port: 51821
-    addresses:
-    - 192.168.254.5/30
-    ip_snat:
-      interface: "{{ network.primary.name }}"
-      to: "{{ network.primary.overlay }}"
-    port_forwardings:
-    - dest: "{{ network.primary.overlay }}"
-      tcp_ports:
-        422: 192.168.254.6:222
-    peers:
-    - pub_key: "{{ hostvars['ele-router'].wireguard_keys.gwhetzner.pub }}"
-      allowed_ips:
-        - 192.168.254.6/32
-        - 192.168.20.0/24
+  # wg-emc:
+  #   description: Elevate Media Channel
+  #   priv_key: "{{ wireguard_keys.emc.priv }}"
+  #   listen_port: 51821
+  #   addresses:
+  #   - 192.168.254.5/30
+  #   ip_snat:
+  #     interface: "{{ network.primary.name }}"
+  #     to: "{{ network.primary.overlay }}"
+  #   port_forwardings:
+  #   - dest: "{{ network.primary.overlay }}"
+  #     tcp_ports:
+  #       422: 192.168.254.6:222
+  #   peers:
+  #   - pub_key: "{{ hostvars['ele-router'].wireguard_keys.gwhetzner.pub }}"
+  #     allowed_ips:
+  #       - 192.168.254.6/32
+  #       - 192.168.20.0/24
 
 
 wireguard_p2p_interface:
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index 7aab28bb..6b071894 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -24,7 +24,7 @@ admin_users_host:
 apt_repo_components:
   - main
   - contrib  ## for zfs
-  - non-free ## for microcode updates
+  - non-free-firmware
 
 spreadspace_apt_repo_components:
   - container