diff --git a/Makefile b/Makefile index 198d3dc..4a527af 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ deploy-bootstrap: ## First-deploy host bootstrap [CONTROLLER_IP=x.x.x.x] $(ANSIBLE_RUN) playbooks/site.yml $(ANSIBLE_FLAGS) -e bootstrap_mode=true $${EXTRA_E} deploy-hardening: ## Deploy full OS hardening L1+L2 (site.yml) [TARGET=] - @echo "=== Full Hardening (L1 Baseline + L2 Compliance/Zero Trust) ===" + @echo "=== Full Hardening (L1 Baseline + L2 Compliance/Private Mesh) ===" $(ANSIBLE_RUN) playbooks/site.yml $(ANSIBLE_FLAGS) deploy-engine: ## Deploy hardened Docker Engine runtime (L6) [TARGET=] diff --git a/playbooks/_shared/overlay_preflight.yml b/playbooks/_shared/overlay_preflight.yml index 9d02369..d7467bc 100644 --- a/playbooks/_shared/overlay_preflight.yml +++ b/playbooks/_shared/overlay_preflight.yml @@ -1,12 +1,12 @@ --- # ============================================================================== -# OVERLAY PRE-FLIGHT - Zero Trust transport check (SSOT) +# OVERLAY PRE-FLIGHT - Private mesh transport check (SSOT) # ============================================================================== # Reusable include for l3/l6/ops playbook pre_tasks. # # WHY THIS FILE EXISTS: # This assert was previously copy-pasted (with drift) across 7 playbooks. -# It lives here so every playbook validates the exact same Zero Trust +# It lives here so every playbook validates the exact same private mesh # invariant: ansible_host MUST be a Tailscale overlay IP inside # tailscale_subnet. Public bootstrap access is only permitted in site.yml. # @@ -32,7 +32,7 @@ ~ (tailscale_subnet | quote) ) == 'True' fail_msg: >- - Zero Trust violation on {{ inventory_hostname }}: this playbook only allows + Private mesh violation on {{ inventory_hostname }}: this playbook only allows connections through the management overlay using ansible_host inside {{ tailscale_subnet }}. Public bootstrap access is only permitted in site.yml. success_msg: >- diff --git a/playbooks/l2/hardening.yml b/playbooks/l2/hardening.yml index fa8fe4e..60ab627 100644 --- a/playbooks/l2/hardening.yml +++ b/playbooks/l2/hardening.yml @@ -89,7 +89,7 @@ tags: [tailscale, l2-compliance, acl, security] tasks: - - name: "Configure Tailscale ACLs (Zero Trust Network Policies)" + - name: "Configure Tailscale ACLs (Private Mesh Network Policies)" when: - groups['brain'] is defined - groups['brain'] | length > 0 diff --git a/playbooks/ops/nuke.yml b/playbooks/ops/nuke.yml index d3c2a43..fdae8e7 100644 --- a/playbooks/ops/nuke.yml +++ b/playbooks/ops/nuke.yml @@ -32,7 +32,7 @@ # - Protected paths are never deleted. # - Nuke is blocked for hosts in inventory group 'production'. # - Remote connectivity always respects inventory 'ansible_host'. -# - In a Zero Trust setup, nuke/stacks operations must run over Tailscale. +# - In a private mesh setup, nuke/stacks operations must run over Tailscale. # ============================================================================== - name: Nuke Developmi Hardened managed infrastructure diff --git a/playbooks/ops/reboot.yml b/playbooks/ops/reboot.yml index 54cf815..7e7480e 100644 --- a/playbooks/ops/reboot.yml +++ b/playbooks/ops/reboot.yml @@ -5,7 +5,7 @@ # Performs an audited, graceful reboot of managed hosts with serial: 1 # to prevent cluster downtime. Automatically polls the host until SSH # is responsive, applies post-reboot settle delay, and verifies critical -# system daemons, Zero Trust connectivity, and running containers. +# system daemons, private mesh connectivity, and running containers. # ============================================================================== - name: "Ops | Controlled Rolling Reboot" diff --git a/roles/L2_compliance/general/tasks/security/nftables_rules.yml b/roles/L2_compliance/general/tasks/security/nftables_rules.yml index b2532a4..531ba60 100644 --- a/roles/L2_compliance/general/tasks/security/nftables_rules.yml +++ b/roles/L2_compliance/general/tasks/security/nftables_rules.yml @@ -18,7 +18,7 @@ that: - 2019 not in allowed_ports - 2020 not in allowed_ports - fail_msg: "CRITICAL: Caddy admin API (2019) / Prometheus API (2020) found in allowed_ports. These control-plane ports are denied on all interfaces (zero-trust, contract §6/M1)." + fail_msg: "CRITICAL: Caddy admin API (2019) / Prometheus API (2020) found in allowed_ports. These control-plane ports are denied on all interfaces (private mesh)." tags: [l2-hardening] # ponytail: nf_conntrack may not be auto-loaded on minimal installs, @@ -102,11 +102,10 @@ tcp dport {{ port }} accept {% endfor %} - # Deny Caddy admin + Prometheus API on ALL interfaces (zero-trust). + # Deny Caddy admin + Prometheus API on ALL interfaces (private mesh). # Must precede the Docker bridge accept below: it closes the # container -> host path to a host-bound 0.0.0.0:2019 admin API # (systemd/bare-metal deployments). The admin API accepts config - # POSTs (contract §6/M1). tcp dport { 2019, 2020 } drop # Docker bridge internal diff --git a/roles/L2_compliance/general/tasks/tailscale/main.yml b/roles/L2_compliance/general/tasks/tailscale/main.yml index a1b7b8a..81362b0 100644 --- a/roles/L2_compliance/general/tasks/tailscale/main.yml +++ b/roles/L2_compliance/general/tasks/tailscale/main.yml @@ -12,7 +12,7 @@ # Validate required secrets and input formats # ------------------------------------------------------------------------------ -- name: Enforce Tailscale ACL OAuth secret presence (Zero Trust requirement) +- name: Enforce Tailscale ACL OAuth secret presence (Private Mesh requirement) ansible.builtin.assert: that: - tailscale_acl_key is defined diff --git a/roles/L4_networking/caddy/templates/Caddyfile.j2 b/roles/L4_networking/caddy/templates/Caddyfile.j2 index 106287c..ca96387 100644 --- a/roles/L4_networking/caddy/templates/Caddyfile.j2 +++ b/roles/L4_networking/caddy/templates/Caddyfile.j2 @@ -202,7 +202,7 @@ respond @sensitive_paths "Forbidden" 403 } -# ── Zero Trust VPN restriction ──────────────────────────────────────── +# ── Private Mesh VPN restriction ────────────────────────────────────── (vpn_only) { @denied_vpn { not remote_ip {{ tailscale_subnet }} 127.0.0.1/8 ::1