Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ The lab hosts below are NixOS VMs on pve01, VLAN 90 (`patchwork.internal`). alas
| `hem` | 358 | 10.100.90.58 | 2 GB | Both staging clusters: central on 5432, restricted on 5433. Quilt staging uses the restricted one. Selvage staging uses both. |
| `batting` | 360 | 10.100.90.60 | 4 GB | Quilt prod + staging. nginx on `tailscale0:80` for alastor. |
| `weft` | 361 | 10.100.90.61 | 4 GB | Krater staging, and Krater production (off until its switch). nginx on `tailscale0:80` for alastor. |
| `hank` | 362 | 10.100.90.62 | 6 GB | Stash prod + staging (declared, not built yet). 80 GB disk for the archived files. nginx on `tailscale0:80` for alastor. |
| `twill` | 363 | 10.100.90.63 | 3 GB | Selvage prod + staging (declared, not built yet). nginx on `tailscale0:80` for alastor, Selvage's public paths only. |
| `hank` | 362 | 10.100.90.62 | 6 GB | Stash prod + staging. 80 GB disk for the archived files. nginx on `tailscale0:80` for alastor. |
| `twill` | 363 | 10.100.90.63 | 3 GB | Selvage prod + staging. nginx on `tailscale0:80` for alastor, Selvage's public paths only. |

The Windows hosts are managed by Ansible (`ansible/`):

Expand All @@ -74,13 +74,13 @@ flowchart LR
alastor -- "tailnet, HTTP :80" --> warp["warp: misc"]
alastor -- "tailnet, HTTP :80" --> batting["batting: Quilt"]
alastor -- "tailnet, HTTP :80" --> weft["weft: Krater staging"]
alastor -- "tailnet, HTTP :80" --> hank["hank: Stash (not built yet)"]
alastor -- "tailnet, HTTP :80" --> hank["hank: Stash"]
batting -- "tailnet :5432" --> seam["seam: patchwork_central_restricted"]
batting -. "staging :5433" .-> hem["hem: :5432 / :5433"]
weft -. "staging :5432" .-> hem
hank -- "tailnet :5432" --> skein["skein: patchwork_central"]
hank -. "staging :5432" .-> hem
alastor -- "tailnet, HTTP :80" --> twill["twill: Selvage (not built yet)"]
alastor -- "tailnet, HTTP :80" --> twill["twill: Selvage"]
twill -- "tailnet :5432" --> skein
twill -- "tailnet :5432" --> seam
```
Expand Down
3 changes: 0 additions & 3 deletions hosts/twill/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
# tag:patchwork-selvage. The policy in jaspermayone/infra must let
# tag:patchwork-selvage reach skein:5432, seam:5432 (production) and
# hem:5432, hem:5433 (staging) only.
#
# Not built yet. After the install, add its host key to secrets/secrets.nix
# and re-key its secrets (README.md, "Selvage on twill").
{ config, ... }:
{
imports = [
Expand Down
Binary file modified secrets/ad-join.age
Binary file not shown.
Binary file added secrets/restricted-prod-selvage.age
Binary file not shown.
18 changes: 7 additions & 11 deletions secrets/secrets.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ let
batting = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEN68vw2ir+q4fMQV8WBJvH7WDG4D2uFjChwkkA93LJC";
weft = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAbzni2Be82ORFcHSPVr7OPpfs80Py04JtwyCKc4L28X";
hank = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKNDAtCadjdzqG+5t6BncycydzqfqV3z02uvIejmO8S";
# twill (Selvage) is not built yet. After its install, add
# twill = "<its /etc/ssh/ssh_host_ed25519_key.pub>";
# here, add twill to selvage-env.age, selvage-staging-env.age,
# selvage-ghcr-token.age and ad-join.age below, then re-encrypt ad-join.age
# alone (README.md, "Selvage on twill", step 10).
twill = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC36MDIDxfWE/HBZnWJfTQzTS2/9p1XtzoEQtHtF6aNl";
#
# Central DB passwords, one file per app and environment, password only:
# central-prod-<app>.age recipients: jsp, skein
Expand Down Expand Up @@ -257,18 +253,17 @@ in
# WEAVE_ISSUER=https://weave.patchworklabs.org
# WEAVE_CLIENT_ID=... WEAVE_CLIENT_SECRET=... (the Selvage app in Weave)
# SELVAGE_AUDIT_CHANNEL=...
# twill is not built yet: add its host key here after the install, before
# bin/new-selvage-secrets writes this file.
"selvage-env.age".publicKeys = [
jsp
twill
];

# GitHub classic PAT with read:packages only, for
# ghcr.io/patchworklabsorg/selvage while the package is private. The same
# pwlbot token as quilt-ghcr-token.age. Add twill after its install, as for
# selvage-env.age.
# pwlbot token as quilt-ghcr-token.age.
"selvage-ghcr-token.age".publicKeys = [
jsp
twill
];

# Selvage staging (selvage-staging.patchworklabs.org on twill,
Expand All @@ -283,10 +278,10 @@ in
# WEAVE_CLIENT_ID=... WEAVE_CLIENT_SECRET=... (a Weave staging app)
# SELVAGE_AUDIT_CHANNEL=... (a channel in the staging workspace)
# WEAVE_ISSUER and SELVAGE_HOSTS are set in hosts/twill/selvage.nix and
# override this file. twill is not built yet: add its host key here after
# the install, as for selvage-env.age.
# override this file.
"selvage-staging-env.age".publicKeys = [
jsp
twill
];

# Quilt's role password in patchwork_central_restricted on hem:5433 (the
Expand Down Expand Up @@ -332,5 +327,6 @@ in
batting
weft
hank
twill
];
}
Binary file added secrets/selvage-env.age
Binary file not shown.
7 changes: 7 additions & 0 deletions secrets/selvage-ghcr-token.age
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
age-encryption.org/v1
-> ssh-ed25519 1uIO/w Bf8W4pE0jS/EZp/lpNK19TTFnFM0wxbgJ5yACZpGED4
ibMrRFyvAelqlnyDr2agP9l6yZ6sQkUwt5PSIxjTBjY
-> ssh-ed25519 IxJlqw G9xTgZgPJJY5uXm5gRJAoaWsSPYil2Lb5Eda24fDfhw
aDMlktg5dOPYiPgXORAfQjA/UIZs9c48Tw6cFF+rwds
--- I58Xge5xzDgPjkamMQAGlwIWOgyEWF3apxgowVLfVrk
®×uܳ¢ìè¨0(¦‘³V¿ì«è¼øç$#’²¢cE§pÝHúY;³¨üû@Ø{~ûicNæ¦óh¸<Œ‡|Rƒ£ÙÈd†{
Loading