counterweight/personal_infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ansible: delete the duplicated vars files, move globals to group_vars/all

Browse source 
Three files existed only as second copies of things group_vars/all already
auto-loads, and 34 playbooks named them in vars_files: - which outranks
group_vars, so the copies won. The day someone edited one and not the other,
those plays would silently keep the stale value. infra_vars.yml was already
drifting: group_vars/all/main.yml had grown age_backup_recipient and
backup_pull_public_key that it lacked.

  infra_vars.yml          - a strict subset of group_vars/all/main.yml
  infra_secrets.yml       - decrypts byte-identical to group_vars/all/vault.yml
  infra_secrets.yml.example - documented Uptime Kuma credentials as the reason
                              the file exists, which stopped being true

Deleted, along with 62 vars_files entries across 34 playbooks (12 of which
named ../../group_vars/all/main.yml directly - same defect, a vars_files entry
duplicating an auto-loaded file at higher precedence than the file itself).

Checked before touching anything: infra_secrets.yml was listed LAST in 10 plays,
after services_config.yml, so removal would flip precedence if the two shared a
key. They share none, and neither does services_config.yml with
group_vars/all/main.yml, so the removal is provably inert.

services_config.yml was the last one standing. It held four unrelated things:

  caddy_sites_dir            - an identical copy of roles/caddy_site/defaults/.
                               Deleted; the role default is now the only one.
  *.tailscale_hostname (x3)  - a THIRD copy of each box's identity, which
                               inventory.ini already holds as ansible_host.
                               Deleted. Edge plays now read
                               hostvars['<host>'].ansible_host - verified an
                               edge play resolves that with nothing loaded and
                               the other host in no play. Three copies of one
                               name is how bitcoin_rpc_host ended up labelled
                               "knots_box" while pointing at fulcrum-box.
  subdomains, ntfy topic,    - genuinely global: their readers span managed,
  headscale namespace          monitoring, vpn_control and edge, so no single
                               group covers them. Moved to group_vars/all/main.yml
                               where they auto-load. The ntfy_topic and
                               headscale_namespace indirection through
                               service_settings collapses to the global name.
  the four cross-host ports  - the only entries with a real justification.
                               Left in place; they move in the next commit.

Also dead, all Uptime Kuma residue or duplication:
  phoenixd_monitor_name, forgejo_runner healthcheck_timeout_seconds/retries,
  fulcrum_tailscale_hostname, and bitcoin_knots_version - the last being a
  v-prefixed copy of bitcoin_knots_version_short that nothing read, two
  hand-maintained copies of one version string.

Corrected a false comment: services_config.yml claimed the uptime_kuma subdomain
"no longer resolves to anything". It resolves to 164.92.239.72 and answers HTTP
302, and 11 playbooks still template it. Same wrong premise as PLAN_3.

Verification: all 37 playbooks' --list-tasks output is byte-identical before and
after. A probe resolving all 22 values services_config.yml used to supply returns
21 identical and one intended deletion (caddy_sites_dir, now role-only - confirmed
the role still resolves it: "Ensure Caddy sites-enabled directory exists" comes
back ok against the real path). memos check-diff identical before and after.
Syntax passes on every playbook.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
counterweight 2026-09-13 20:58:46 +02:00
parent 0f03c503c8
commit 954b683c71
Signed by: counterweight
GPG key ID: 883EDBAA726BD96C
53 changed files with 82 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

71
ansible/services_config.yml
View file

@ -1,67 +1,24 @@
# Centralized Services Configuration
# Subdomains and Caddy settings for all services
# Edit these subdomains to match your preferences
subdomains:
# Monitoring Services (on watchtower)
ntfy: ntfy
# DEPRECATED 2026-09-11 — Uptime Kuma is decommissioned and this subdomain no
# longer resolves to anything. Kept only because the deprecated monitoring
# blocks still template it into uptime_kuma_api_url. See archive/uptime_kuma/.
uptime_kuma: uptime
# VPN Infrastructure (on spacey)
headscale: headscale
# Core Services (on vipy)
vaultwarden: vault
forgejo: forgejo
lnbits: wallet
# Secondary Services (on vipy)
ntfy_emergency_app: avisame
personal_blog: pablohere
# Memos (on memos-box)
memos: memos
# Mempool Block Explorer (on mempool_box, proxied via vipy)
mempool: mempool
# DATUM Gateway dashboard (on knots_box, proxied via vipy)
datum_gateway: datum
# Caddy configuration
caddy_sites_dir: /etc/caddy/sites-enabled
# Service-specific settings shared across playbooks
# Cross-host service settings.
#
# These exist because a value is needed by the service's own role on one host
# AND by a play that runs on the edge host. A role default is invisible to that
# second play, so it cannot live in roles/<svc>/defaults/.
#
# Everything else that used to be here has moved:
# subdomains, ntfy topic, headscale namespace -> group_vars/all/main.yml
# caddy_sites_dir -> roles/caddy_site/defaults/
# *.tailscale_hostname -> deleted; inventory already
# holds each box's identity as ansible_host, and an edge play reads it with
# hostvars['<host>'].ansible_host. Three copies of one name is how
# bitcoin_rpc_host ended up labelled "knots_box" while pointing at
# fulcrum-box.
service_settings:
ntfy:
topic: alerts
headscale:
namespace: counter-net
mempool:
# The frontend port is needed in two places on two different hosts: the
# mempool role deploys it on mempool-box, and the Caddy play proxies to it
# from the edge host. A role default cannot serve the second play, so it
# lives here rather than in roles/mempool/defaults.
frontend_port: 8080
bitcoin:
# The P2P port is needed on two hosts: the bitcoin_knots role deploys the
# node on knots-box, and the socket-proxy play publishes the port from the
# edge host. A role default cannot reach that second play.
p2p_port: 8333
tailscale_hostname: knots-box
datum_gateway:
# Needed on two hosts: the datum_gateway role deploys on knots-box, while the
# Caddy play (dashboard) and the socket-proxy play (Stratum) both run on the
# edge host. A role default cannot reach either of those plays.
api_port: 7152
stratum_port: 23334
tailscale_hostname: knots-box
fulcrum:
# Same shape as mempool: the fulcrum role deploys on fulcrum-box, and the
# socket-proxy play publishes the SSL port from the edge host. A role default
# is invisible to that second play.
ssl_port: 50002
tailscale_hostname: fulcrum-box