From 4341a42373a2bb85ad3d254c33a507ff76cb65d4 Mon Sep 17 00:00:00 2001
From: Rasmus Wejlgaard <pez@pez.sh>
Date: Fri, 3 Apr 2026 17:49:51 +0000
Subject: [PATCH] Remove cloudflared from london-a (PESO-134)

cloudflared has been replaced by Caddy + Authelia. Removed:
- cloudflared service config (services/cloudflared/london-a/)
- tunnel ID from london-a host_vars
- cloudflared_enable from rc.conf

Also synced rc.conf with live server state (disabled services
from PESO-113, added node_exporter_listen_address).

Live server: stopped service, removed from rc.conf, uninstalled pkg.
---
 ansible/inventory/host_vars/london-a.yml              |  8 +++-----
 ansible/services/cloudflared/london-a/cloudflared.yml |  4 ----
 ansible/services/rc.d/london-a/rc.conf                | 11 +++++------
 3 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 ansible/services/cloudflared/london-a/cloudflared.yml

diff --git a/ansible/inventory/host_vars/london-a.yml b/ansible/inventory/host_vars/london-a.yml
index 4725026..bc7e8db 100644
--- a/ansible/inventory/host_vars/london-a.yml
+++ b/ansible/inventory/host_vars/london-a.yml
@@ -18,9 +18,7 @@ zfs_scrub_schedule: "0 12 * * 0"
 # Core services (documented)
 # sshd, ntpd, powerd, zfs, tailscaled, grafana, prometheus, node_exporter
 
-# Cloudflare Tunnel — proxies Grafana/Prometheus via pez.sh
-cloudflared_tunnel_id: "168eccae-2497-48e2-a1e2-c12cd3448d9a"
-
-# --- Disabled services (cleaned up 2026-04-02, PESO-113) ---
-# InfluxDB, Redis, PostgreSQL, libvirtd — all disabled in rc.conf.
+# --- Disabled/removed services ---
+# cloudflared — removed 2026-04-03 (PESO-134). Replaced by Caddy + Authelia.
+# InfluxDB, Redis, PostgreSQL, libvirtd — disabled 2026-04-02 (PESO-113).
 # Were leftover from a defunct pez_vps project. Pez approved removal.
diff --git a/ansible/services/cloudflared/london-a/cloudflared.yml b/ansible/services/cloudflared/london-a/cloudflared.yml
deleted file mode 100644
index 8a79662..0000000
--- a/ansible/services/cloudflared/london-a/cloudflared.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-tunnel: 168eccae-2497-48e2-a1e2-c12cd3448d9a
-protocol: http2
-credentials-file: /root/.cloudflared/168eccae-2497-48e2-a1e2-c12cd3448d9a.json
diff --git a/ansible/services/rc.d/london-a/rc.conf b/ansible/services/rc.d/london-a/rc.conf
index 6a37790..b14e635 100644
--- a/ansible/services/rc.d/london-a/rc.conf
+++ b/ansible/services/rc.d/london-a/rc.conf
@@ -17,9 +17,8 @@ grafana_enable="YES"
 prometheus_enable="YES"
 node_exporter_enable="YES"
 tailscaled_enable="YES"
-cloudflared_enable="YES"
-cf_tunnel_id="168eccae-2497-48e2-a1e2-c12cd3448d9a"
-influxd_enable="YES"
-libvirtd_enable="YES"
-redis_enable="YES"
-postgresql_enable="YES"
+influxd_enable="NO"
+libvirtd_enable="NO"
+redis_enable="NO"
+postgresql_enable="NO"
+node_exporter_listen_address="100.122.219.41:9100"