From 3ce559d7b98996f67ce17a34c7097d4fbaefa88e Mon Sep 17 00:00:00 2001
From: "Rasmus \"Pez\" Wejlgaard" <pez@pez.sh>
Date: Thu, 2 Apr 2026 22:19:26 +0100
Subject: [PATCH] Wire thiswebsitedoesnotexist.service into deployment pipeline

- Move unit file from services/systemd/helsinki-a/ to
  services/thiswebsitedoesnotexist/ (matches systemd_services role convention)
- Add systemd_services: [thiswebsitedoesnotexist] to helsinki-a host_vars
- Add systemd_services role to helsinki-a stage in deploy.yml
- Remove redundant caddy.service (apt manages this via the caddy role)

Closes PESO-117
---
 ansible/deploy.yml                            |  1 +
 ansible/inventory/host_vars/helsinki-a.yml    |  3 +++
 .../services/systemd/helsinki-a/caddy.service | 25 -------------------
 .../thiswebsitedoesnotexist.service           |  0
 4 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 ansible/services/systemd/helsinki-a/caddy.service
 rename ansible/services/{systemd/helsinki-a => thiswebsitedoesnotexist}/thiswebsitedoesnotexist.service (100%)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 6b9e2b5..5b65b88 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -53,6 +53,7 @@
   roles:
     - role: caddy
     - role: status_page
+    - role: systemd_services
 
 # london-b: Docker services (storage, apps) + media stack + backups
 - name: "Stage 4b: Services (london-b)"
diff --git a/ansible/inventory/host_vars/helsinki-a.yml b/ansible/inventory/host_vars/helsinki-a.yml
index 5fb181a..1fee8d1 100644
--- a/ansible/inventory/host_vars/helsinki-a.yml
+++ b/ansible/inventory/host_vars/helsinki-a.yml
@@ -10,6 +10,9 @@ docker_services:
   - forgejo
   - bitwarden
 
+systemd_services:
+  - thiswebsitedoesnotexist
+
 node_exporter_bind_tailscale: true
 
 common_ufw_allowed_ports:
diff --git a/ansible/services/systemd/helsinki-a/caddy.service b/ansible/services/systemd/helsinki-a/caddy.service
deleted file mode 100644
index 8fd094c..0000000
--- a/ansible/services/systemd/helsinki-a/caddy.service
+++ /dev/null
@@ -1,25 +0,0 @@
-# Stock Caddy service unit (installed via package manager)
-# Included for reference — not a custom unit
-#
-# Config file: /etc/caddy/Caddyfile
-
-[Unit]
-Description=Caddy
-Documentation=https://caddyserver.com/docs/
-After=network.target network-online.target
-Requires=network-online.target
-
-[Service]
-Type=notify
-User=caddy
-Group=caddy
-ExecStart=/usr/bin/caddy run --environ --config /etc/caddy/Caddyfile
-ExecReload=/usr/bin/caddy reload --config /etc/caddy/Caddyfile --force
-TimeoutStopSec=5s
-LimitNOFILE=1048576
-PrivateTmp=true
-ProtectSystem=full
-AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ansible/services/systemd/helsinki-a/thiswebsitedoesnotexist.service b/ansible/services/thiswebsitedoesnotexist/thiswebsitedoesnotexist.service
similarity index 100%
rename from ansible/services/systemd/helsinki-a/thiswebsitedoesnotexist.service
rename to ansible/services/thiswebsitedoesnotexist/thiswebsitedoesnotexist.service