From 25d201f930770ab2dbce0c6dc3a91d04b97290d3 Mon Sep 17 00:00:00 2001
From: "Rasmus \"Pez\" Wejlgaard" <pez@pez.sh>
Date: Fri, 3 Apr 2026 19:50:51 +0100
Subject: [PATCH] Add copenhagen-a to docker_hosts and wire up minecraft docker
 service (#52)

- Add copenhagen-a to [docker_hosts] inventory group so the docker role
  runs on it in Stage 2
- Add docker_services: [minecraft] to copenhagen-a host_vars
- Add docker_services role to Stage 4d (copenhagen-a) in deploy.yml
- Update deploy-on-merge scope mapping to include copenhagen-a for
  docker role changes

Closes PESO-132
---
 .github/workflows/deploy-on-merge.yml        | 2 +-
 ansible/deploy.yml                           | 3 ++-
 ansible/inventory/host_vars/copenhagen-a.yml | 4 ++++
 ansible/inventory/hosts.ini                  | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-on-merge.yml b/.github/workflows/deploy-on-merge.yml
index cec1bf3..49dbc01 100644
--- a/.github/workflows/deploy-on-merge.yml
+++ b/.github/workflows/deploy-on-merge.yml
@@ -58,7 +58,7 @@ jobs:
               ansible/roles/caddy/*|ansible/roles/status_page/*)
                 HOSTS="$HOSTS helsinki-a" ;;
               ansible/roles/docker/*)
-                HOSTS="$HOSTS helsinki-a london-b nuremberg-a" ;;
+                HOSTS="$HOSTS helsinki-a london-b nuremberg-a copenhagen-a" ;;
               ansible/roles/docker_services/*)
                 HOSTS="$HOSTS helsinki-a london-b nuremberg-a copenhagen-a" ;;
               ansible/roles/media_stack/*|ansible/roles/backup/*)
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 5ced638..78cf7c4 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -81,11 +81,12 @@
     - role: firewall_alpine
     - role: docker_services
 
-# copenhagen-a: Gaming servers (MaNGOS only — Docker removed per PESO-104)
+# copenhagen-a: Gaming servers (MaNGOS + Minecraft via Docker)
 - name: "Stage 4d: Gaming servers (copenhagen-a)"
   hosts: copenhagen-a
   tags: [services, gaming]
   roles:
+    - role: docker_services
     - role: systemd_services
 
 # london-a: Monitoring stack (FreeBSD — Prometheus, Grafana)
diff --git a/ansible/inventory/host_vars/copenhagen-a.yml b/ansible/inventory/host_vars/copenhagen-a.yml
index d38e254..acee902 100644
--- a/ansible/inventory/host_vars/copenhagen-a.yml
+++ b/ansible/inventory/host_vars/copenhagen-a.yml
@@ -12,6 +12,10 @@ systemd_services:
   - cloudflared
   - node_exporter
 
+# Docker Compose services deployed by docker_services role
+docker_services:
+  - minecraft
+
 # MaNGOS database backend — managed by apt, not Ansible
 system_packages_services:
   - mariadb
diff --git a/ansible/inventory/hosts.ini b/ansible/inventory/hosts.ini
index 28c4f64..7bd2631 100644
--- a/ansible/inventory/hosts.ini
+++ b/ansible/inventory/hosts.ini
@@ -25,6 +25,7 @@ copenhagen-a
 helsinki-a
 london-b
 nuremberg-a
+copenhagen-a
 
 [monitoring]
 london-a