From 8665a5fe99478cef98bd26a46ed801c038132b22 Mon Sep 17 00:00:00 2001 From: "Rasmus \"Pez\" Wejlgaard" Date: Fri, 12 Jun 2026 19:24:39 +0100 Subject: [PATCH] remove stale promtail/rc.d leftovers, rss DNS record, fix london-c host description (#131) --- ansible/inventory/host_vars/london-c.yml | 4 +-- ansible/services/promtail/config/london-b.yml | 32 ------------------- ansible/services/promtail/promtail.service | 14 -------- ansible/services/rc.d/london-a/rc.conf | 24 -------------- terraform/hetzner/dns.tf | 2 +- 5 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 ansible/services/promtail/config/london-b.yml delete mode 100644 ansible/services/promtail/promtail.service delete mode 100644 ansible/services/rc.d/london-a/rc.conf diff --git a/ansible/inventory/host_vars/london-c.yml b/ansible/inventory/host_vars/london-c.yml index 5f5351d..7cd6cf8 100644 --- a/ansible/inventory/host_vars/london-c.yml +++ b/ansible/inventory/host_vars/london-c.yml @@ -1,6 +1,6 @@ --- -host_role: idle -host_description: "Idle/available" +host_role: utility +host_description: "Octopus Energy exporter, edge utility box" host_location: "London" prometheus_location: london diff --git a/ansible/services/promtail/config/london-b.yml b/ansible/services/promtail/config/london-b.yml deleted file mode 100644 index 33605b2..0000000 --- a/ansible/services/promtail/config/london-b.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -server: - http_listen_port: 9080 - grpc_listen_port: 0 - -positions: - filename: /tmp/positions.yaml - -clients: - - url: http://192.168.1.254:3100/loki/api/v1/push - -scrape_configs: - - job_name: london-b - static_configs: - - targets: - - localhost - labels: - job: varlogs - instance: london-b - __path__: /var/log/*log - - targets: - - localhost - labels: - job: plex - instance: london-b - __path__: /var/lib/plexmediaserver/Library/Application Support/Plex Media Server/Logs/*log - - targets: - - localhost - labels: - job: jellyfin - instance: london-b - __path__: /var/log/jellyfin/*log diff --git a/ansible/services/promtail/promtail.service b/ansible/services/promtail/promtail.service deleted file mode 100644 index f07acb8..0000000 --- a/ansible/services/promtail/promtail.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Promtail service -After=network.target - -[Service] -Type=simple -User=root -ExecStart=/usr/bin/promtail -config.file /etc/promtail/config.yml -TimeoutSec=60 -Restart=on-failure -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/ansible/services/rc.d/london-a/rc.conf b/ansible/services/rc.d/london-a/rc.conf deleted file mode 100644 index b14e635..0000000 --- a/ansible/services/rc.d/london-a/rc.conf +++ /dev/null @@ -1,24 +0,0 @@ -# /etc/rc.conf — london-a (FreeBSD) -# Captured 2026-03-22 - -clear_tmp_enable="YES" -hostname="london-a" -ifconfig_em0="inet 192.168.1.254 netmask 255.255.255.0" -defaultrouter="192.168.1.1" -ifconfig_em0_ipv6="inet6 accept_rtadv" -sshd_enable="YES" -ntpd_enable="YES" -powerd_enable="YES" -moused_nondefault_enable="NO" -# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable -dumpdev="AUTO" -zfs_enable="YES" -grafana_enable="YES" -prometheus_enable="YES" -node_exporter_enable="YES" -tailscaled_enable="YES" -influxd_enable="NO" -libvirtd_enable="NO" -redis_enable="NO" -postgresql_enable="NO" -node_exporter_listen_address="100.122.219.41:9100" diff --git a/terraform/hetzner/dns.tf b/terraform/hetzner/dns.tf index 96286ea..1e4b992 100644 --- a/terraform/hetzner/dns.tf +++ b/terraform/hetzner/dns.tf @@ -16,7 +16,7 @@ resource "hcloud_zone_rrset" "A_helsinki_a" { "@", "apps", "auth", "bitwarden", "download", "git", "helsinki-a", "jellyfin", "jellyfin-requests", "ldap", "lidarr", "london-a", "music", "naveen", "plex", "prowlarr", "radarr", "readarr", "request", - "rss", "sonarr", "soulseek", "status", + "sonarr", "soulseek", "status", ]) zone = hcloud_zone.pezsh.name name = each.value