From dfb51e66ec53b91826a333ab1325e4fe29549c55 Mon Sep 17 00:00:00 2001
From: Rasmus Wejlgaard <pez@pez.sh>
Date: Sat, 25 Apr 2026 15:02:34 +0100
Subject: [PATCH] fix: optimize deploy playbook and get rid of deprecated stuff

---
 ansible/deploy.yml                            | 28 +++++++++++--------
 ansible/roles/systemd_exporter/tasks/main.yml |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 9ff6249..6bc56f3 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -64,29 +64,33 @@
     - role: status_page
     - role: systemd_services
 
-# london-b: Docker services (storage, apps) + media stack + backups
-- name: "Stage 4b: Services (london-b)"
-  hosts: london-b
-  tags: [services, london-b]
+# All docker hosts: deploy compose services
+- name: "Stage 4b: Docker services"
+  hosts: docker_hosts
+  tags: [services, docker_services]
   roles:
     - role: docker_services
-    - role: media_stack
-    - role: backup
 
-# nuremberg-a: Mail (poste.io via Docker)
-- name: "Stage 4c: Mail (nuremberg-a)"
+# nuremberg-a: Firewall
+- name: "Stage 4c: Firewall (nuremberg-a)"
   hosts: nuremberg-a
   tags: [services, mail]
   roles:
     - role: firewall_alpine
-    - role: docker_services
 
-# copenhagen-a: Gaming servers (MaNGOS + Minecraft via Docker)
-- name: "Stage 4d: Gaming servers (copenhagen-a)"
+# london-b: Media stack + backups
+- name: "Stage 4d: Media stack + backups (london-b)"
+  hosts: london-b
+  tags: [services, london-b]
+  roles:
+    - role: media_stack
+    - role: backup
+
+# copenhagen-a: Gaming servers
+- name: "Stage 4e: Gaming servers (copenhagen-a)"
   hosts: copenhagen-a
   tags: [services, gaming]
   roles:
-    - role: docker_services
     - role: systemd_services
     - role: mariadb
 
diff --git a/ansible/roles/systemd_exporter/tasks/main.yml b/ansible/roles/systemd_exporter/tasks/main.yml
index 53c0f98..b3d6639 100644
--- a/ansible/roles/systemd_exporter/tasks/main.yml
+++ b/ansible/roles/systemd_exporter/tasks/main.yml
@@ -32,7 +32,7 @@
 - name: Set architecture fact
   ansible.builtin.set_fact:
     systemd_exporter_arch: >-
-      {{ ansible_architecture
+      {{ ansible_facts['architecture']
          | regex_replace('x86_64', 'amd64')
          | regex_replace('aarch64', 'arm64') }}