More rework

bank.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: bank
   roles:
     - common

bar.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: bank-pi.bitlair.nl
   vars:
     raspi_rotate_display: "2"

common.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: debian
   roles:
     - common

fotos.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: fotos
   roles:
     - common

git-ci.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: git-ci
   roles:
     - common

git.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: git
   roles:
     - common

hosts.yaml

@@ -1,43 +0,0 @@
-all:
-  children:
-    raspi:
-      hosts:
-        bank-pi.bitlair.nl:
-    kvm:
-      hosts:
-        kvm4.bitlair.nl:
-    debian:
-      children:
-        bank:
-          hosts:
-            bank.bitlair.nl:
-        fotos:
-          hosts:
-            blockchain.bitlair.nl:
-        git:
-          hosts:
-            git.bitlair.nl:
-        git-ci:
-          hosts:
-            git-ci.bitlair.nl:
-        pad:
-          hosts:
-            pad.bitlair.nl:
-        lights:
-          hosts:
-            lights.bitlair.nl:
-        mqtt_internal:
-          hosts:
-            mqtt.bitlair.nl:
-        monitoring:
-          hosts:
-            dashboard.bitlair.nl:
-        music:
-          hosts:
-            music.bitlair.nl:
-        services:
-          hosts:
-            service.bitlair.nl:
-        wiki:
-          hosts:
-            wiki.bitlair.nl:

inventory

@@ -0,0 +1,20 @@
+# Inventory
+
+[raspi]
+bank-pi.bitlair.nl
+
+[kvm]
+kvm4.bitlair.nl
+
+[debian]
+bank.bitlair.nl
+blockchain.bitlair.nl
+git.bitlair.nl
+git-ci.bitlair.nl
+pad.bitlair.nl
+lights.bitlair.nl
+mqtt.bitlair.nl
+dashboard.bitlair.nl
+music.bitlair.nl
+service.bitlair.nl
+wiki.bitlair.nl

monitoring.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: monitoring
   roles:
     - common

mqtt-internal.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: mqtt_internal
   roles:
     - common

music.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: music
   roles:
     - common

pad.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: pad
   vars:
     acme_san_domains:

roles/common-bitlair/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: Update authorized_keys
-  tags: authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
     dest: /root/.ssh/authorized_keys
     mode: 0600
   when: root_access is defined and root_access
+  tags: authorized_keys

roles/common/tasks/main.yaml

@@ -1,13 +1,17 @@
 ---
-- tags: [ debian-upgrade, never ]
+
+- name: Import debian-upgrade.yaml if not bookworm
   ansible.builtin.import_tasks:
     file: debian-upgrade.yaml
   when: ansible_facts['distribution_release'] != "bookworm"
+  tags: [ debian-upgrade, never ]
 
-- tags: debian_backports
+- name: Import debian-backports.yaml
   ansible.builtin.import_tasks:
     file: debian-backports.yaml
 
+  tags: debian_backports
+
 - tags: unattended_updates
   ansible.builtin.import_tasks:
     file: unattended-updates.yaml

services.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: services
   roles:
     - common

www.yaml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: wiki
   roles:
     - common