Skip to content

feat(secrets): trinity's age key and the sensitive tier's secrets (#404) - #688

Merged
Gerrrt merged 1 commit into
mainfrom
gerrrt/trinity-sensitive-secrets
Sep 28, 2026
Merged

Gerrrt merged 1 commit into
mainfrom
gerrrt/trinity-sensitive-secrets

Conversation

@Gerrrt

@Gerrrt Gerrrt commented Sep 28, 2026

Copy link
Copy Markdown
Owner

Refs #404. Runbook §6 (build-the-sensitive-tier-host.md).

Changes

  • .sops.yaml: the sensitive rule's REPLACE_WITH_SENSITIVE_AGE_PUBLIC_KEY placeholder becomes trinity's public key, age1cpdxl6p4…tjtsw. make secrets-init STACK=sensitive wrote it on trinity. No other line changes.
  • secrets/sensitive.sops.yaml: new. It holds the tier's seven values, encrypted to that one key.

Checks run

On trinity, before copying, and without printing any value:

  • The file decrypts with trinity's key, and its only recipient is that key.
  • All seven keys are present, and none is empty or still a change-me placeholder.
  • VAULTWARDEN_ADMIN_TOKEN is an argon2id PHC string, and ADGUARD_ADMIN_PASSWORD_HASH is a bcrypt hash.
  • check_sops_rules.py maps the file to the sensitive rule, not the catch-all. That rule is the reason the placeholder existed: the catch-all would have encrypted the tier's secrets to the estate's key.

On prometheus, after the copy:

  • check_sops_rules.py and check_docs.py pass.
  • A strict scan for age private keys finds none in either file.
  • The local gitleaks run didn't happen, because gitleaks isn't installed here. CI's Secret scan covers it.

Still owed

The technical second's recipient must join this rule before the tier holds real data (ADR-0024, #404 step 10).

🤖 Generated with Claude Code

`make secrets-init STACK=sensitive`, run on trinity on 2026-09-28, filled
the sensitive rule's placeholder with trinity's public key and created
secrets/sensitive.sops.yaml. Its seven values were set by hand on trinity.

What was checked there before the copy, without printing a value: the file
decrypts with trinity's key, it is encrypted to that one recipient only,
and none of the seven keys is empty or still a change-me placeholder.
VAULTWARDEN_ADMIN_TOKEN is an argon2id PHC string and
ADGUARD_ADMIN_PASSWORD_HASH is a bcrypt hash. check_sops_rules.py maps
the file to the sensitive rule, not the catch-all.

The two files carry a public key and ciphertext, nothing else. The
technical second's recipient joins this rule before the tier holds real
data (ADR-0024), as #404 step 10 says.

Refs #404

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Gerrrt
Gerrrt merged commit aae9fd0 into main Sep 28, 2026
7 checks passed
@Gerrrt
Gerrrt deleted the gerrrt/trinity-sensitive-secrets branch September 28, 2026 04:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant