Found live, 2026-09-22: after fixing pia-killswitch.sh's FORWARD-jump repositioning and getting one pia-gateway register attempt past the safety check, the very next attempt - roughly an hour later, no reboot, no UFW reload, no script content change in between - hit the identical "FORWARD jump to kill-switch chain is not first" failure again. This disproves the earlier assumption that kube-router/dockerd reassert their own position-1 jumps only at boot/restart scale: kube-router resyncs on ordinary Kubernetes API events, and this cluster's CronJobs (ca-sync, porkbun-ddns, gitea-backup) each create/delete a Pod every few minutes - plausible triggers for kube-router's own reconciliation loop, and therefore plausible triggers for this drift, recurring on a timescale of minutes. The reposition logic itself (previous commit) is correct - it just only ran on the existing triggers (boot, UFW reload, an Ansible-detected script content change), none of which fired between the two attempts. Adds pia-killswitch-reassert.timer/.service: re-runs the already fully idempotent pia-killswitch.sh every pia_healthcheck_interval_sec (same cadence as the health check), giving it regular chances to run instead of only sporadic ones. Deliberately separate from pia-gateway-recover.timer and NOT gated by pia_auto_recovery_enabled - this is the kill switch continuing to assert its own already- established, narrowly-scoped state (source rule, table default, FORWARD jump position), the same kind of thing it already does unconditionally at boot and after a UFW reload, just on a schedule too - not the higher-level automatic recovery/registration logic the plan was deliberately cautious about running unattended. Unblocked live in the meantime with a manual `sudo systemctl restart pia-killswitch.service`. Offline checks: yamllint, ansible-playbook --syntax-check, rendered templates (Jinja2 + bash -n on the updated script), ansible-lint (diffed against main - no new finding categories), full pia_gateway.py test suite (94/94, unaffected by this change) all pass. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
55 lines
2.3 KiB
YAML
55 lines
2.3 KiB
YAML
---
|
|
# Part of role: pia-gateway
|
|
# Handlers fire in the order listed here (not the order notified):
|
|
# 1. systemd daemon reload must stay first so unit-file content changes
|
|
# are picked up before any restart handler below acts on them.
|
|
# 2. "Reload ufw" must come before "Restart pia-killswitch" — a UFW
|
|
# reload rebuilds ufw's own chains and, depending on how it's
|
|
# triggered, can in principle disturb rules inserted directly into
|
|
# the base FORWARD chain (our position-1 jump to
|
|
# {{ pia_iptables_chain }}) outside ufw's own bookkeeping. Restarting
|
|
# pia-killswitch immediately after re-establishes that jump and the
|
|
# chain's contents idempotently, closing the window rather than
|
|
# leaving it open until the next reboot. This only protects against
|
|
# ufw reloads that happen *through this Ansible run* (i.e., a task
|
|
# here notifies both) — a `ufw reload` run manually and separately,
|
|
# outside of Ansible entirely, is not something a handler can react
|
|
# to; that residual gap is closed only by every real boot re-running
|
|
# pia-killswitch.service fresh (WantedBy=multi-user.target).
|
|
# 3. "Restart pia-killswitch" must come before "Restart pia-wg" — if
|
|
# both fire together (e.g. pia-wg's config changed AND the
|
|
# killswitch script changed in the same run), pia-wg's own PostUp
|
|
# needs to run last so its "open" route is the final word, not
|
|
# killswitch's route-table seeding.
|
|
# 4. "Restart pia-killswitch reassertion timer" only restarts the
|
|
# *timer* (a scheduling change, e.g. its interval), never runs the
|
|
# script itself — no ordering constraint against the others.
|
|
|
|
- name: Reload systemd daemon
|
|
ansible.builtin.systemd:
|
|
daemon_reload: true
|
|
|
|
- name: Reload ufw
|
|
community.general.ufw:
|
|
state: reloaded
|
|
|
|
- name: Restart pia-killswitch
|
|
ansible.builtin.systemd:
|
|
name: pia-killswitch.service
|
|
state: restarted
|
|
|
|
- name: Restart pia-killswitch reassertion timer
|
|
ansible.builtin.systemd:
|
|
name: pia-killswitch-reassert.timer
|
|
state: restarted
|
|
|
|
- name: Restart pia-wg
|
|
ansible.builtin.systemd:
|
|
name: "wg-quick@{{ pia_wg_interface }}"
|
|
state: restarted
|
|
|
|
- name: Restart pia-gateway-healthcheck timer
|
|
ansible.builtin.systemd:
|
|
name: pia-gateway-healthcheck.timer
|
|
state: restarted
|