Repository navigation
feat(selvage): add the production secrets - #101
Open
jaspermayone wants to merge 3 commits into
Open
jaspermayone wants to merge 3 commits into
jaspermayone wants to merge 3 commits into
Conversation
* origin/main: feat(krater): blue/green portal deploys, on for staging (#104) feat(krater): pull CI's image instead of building on weft (#103) feat(ansible): run ad converge build from ad.yml (#105) feat(selvage): add a staging instance on twill (#102) feat(selvage): pass the admin web ui paths through nginx on twill (#100)
jaspermayone
marked this pull request as ready for review
November 13, 2026 12:58
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This is the Selvage go-live branch (README "Selvage on twill", "Go live"). It holds the production secrets that
bin/new-selvage-secretswrote. Do not merge it yet. The lab hosts followmain, so the merge is the deploy: seam sets theselvagerole password, and twill starts Selvage.secrets/selvage-env.agesecrets/selvage-ghcr-token.agesecrets/restricted-prod-selvage.agesecrets/ad-join.agesecrets.nixalso adds twill toselvage-staging-env.age. That file does not exist yet:bin/new-selvage-staging-secretswrites it.bin/new-selvage-secretsreported no missing required key, soselvage-env.agehas the database URLs,SECRET_KEY_BASE,WEAVE_ISSUER, the weave client, the Slack signing secret, the bot and admin tokens, andSELVAGE_AUDIT_CHANNEL. The browser token and cookie are optional and the script does not report them. Nobody decrypted the file to check.Before the merge (README "Go live")
image.ymlpushedghcr.io/patchworklabsorg/selvage:main.10.100.90.63free, 3 GiB spare on pve01..\converge.ps1, thenansible-playbook ad.yml -t host-groups.bin/install-host twill.sudo tailscale up --advertise-tags=tag:patchwork,tag:patchwork-selvage.ssh-keyscan -t ed25519 10.100.90.63, addtwilltosecrets/secrets.nixand toselvage-env.age,selvage-ghcr-token.ageandad-join.age.ad-join.age,selvage-env.ageandselvage-ghcr-token.agealone, with theage -d | age -e -Rcommand from the README. The secrets were written before step 8, so all three need it. Do not runagenix -r.https://selvage.patchworklabs.org/auth/callbackon the Selvage app in weave.Steps 9 and 11 (write the secrets, fill in Slack and weave) are done in the first commit.
Twill build (2026-11-13)
tofu plan, targeted to twill: 1 to add, 0 to change, 0 to destroy. Applied.nixos-anywhere --flake .#twillexited 0. twill answers on10.100.90.63.ansible-playbook ad.yml -t host-groupsand-t converge(infra#105) madelnx-twill-*andtwill-admins.ssh-keyscan -t ed25519 10.100.90.63.age -d | age -e -R. For each one, the recipient stanza count matchessecrets.nix, and the sha256 of the plaintext is the same as before. Nothing was printed.nix flake check --no-build --all-systemspasses.nix fmt -- --cifails only ontests/ad-org.nix, which is already unformatted onmain.tailscale upon twill) and the weave redirect URI.Review
An adversarial review checked the files without decrypting them. Only the three files change. Each one is an age file with no plaintext. The recipient stanzas match
secrets/secrets.nix. The file names match the readers on twill and seam. It found one order risk: a merge now would set the role password on seam before twill exists. That is why this PR waits.