From c1cc5788800ee9332e83c9f28a185a0cade3822c Mon Sep 17 00:00:00 2001 From: Jasper Mayone Date: Thu, 12 Nov 2026 20:55:48 -0500 Subject: [PATCH 1/2] feat(selvage): add the production secrets --- secrets/restricted-prod-selvage.age | Bin 0 -> 386 bytes secrets/selvage-env.age | Bin 0 -> 1628 bytes secrets/selvage-ghcr-token.age | 5 +++++ 3 files changed, 5 insertions(+) create mode 100644 secrets/restricted-prod-selvage.age create mode 100644 secrets/selvage-env.age create mode 100644 secrets/selvage-ghcr-token.age diff --git a/secrets/restricted-prod-selvage.age b/secrets/restricted-prod-selvage.age new file mode 100644 index 0000000000000000000000000000000000000000..1582b83b90240f08f5424c2c950c1f97f2f77d86 GIT binary patch literal 386 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSPEcNu)FITWMD$_Sl z&GZV3@(nH2_RTJeFenWvvP`P5tSZwtN;S7A3NBCgPs$F=DCbJ5sPxlz4GW1duy6^l zG|f*9af?dH%<(7)OgBu;$_@{5%`vt#2rA6f&qlYcD%8@)I8ebPIm5KdDLWv{z0l0k zJis#UN>6s8``n*QDwv@;jJ!_H6m#BL0_qTH^D}a_#UJ zd)CFI_j!jOHWTnL`!8ebyW&2EiE8SX?bulD{fM9PF5>5 zOIk@uS9ec0XLvYsSyo|gXGU6QWMOZ4G*C}LNpA{<*n1|(skmAJ11cUq0P^G~!{VRv z*0-wG|L;f{L=}lq;fHlDEaj4Q9-yn*>Ve&@bL`v6HUElL<5vf%e5V1BX3cb5v$ng7 zgYd7X+3D7|Km_Hx8eo&~Go-KbfS=-VLXDu?afSafg$g1RR%? zw8gn995&w2HS-(!1a#Qe5a(9m?=-UHzA)c0-&hn3G{E70>&h{dUhk`5G29iQ)hvU- zTGz>L{z5xvSVV@osKeCD;{T*tl*Be6sZOx=*D!XCg?93>{`SWohGIid14CN-}abCaI8rk%GEN*&VT64SGlv-CBH>r1g9XC zHk&Kaaq#&Pd{PB6bBSd(B70%F#b6?cJMc%)MCw-0H9U8w?FEuRAFX&*QXFw=8rx8@eRX_lpq~ zbI?kj$4{P;BdHC6GbRnn^esdc`DdvD&xwT3yYZ^GH9D9MjJ9~B9hd>=pq;*gCYumI zsKJ*nG@&1=lkJadfbE7=%32I`S8+AVG~+OY0DG4703~o)9-odsST`|^QJ$?zLWD|K;B>qT0s|g?O9tU%j5!ZRDav)tHLT&K=w@gw4s`O%SH48MzEEGI11*2cF`=m z3{H}*Szm64;tZSZFrG#!@pdWO)9E_v16f^YUnk*zXw-|-`&EZrevt}(ucby-<@6{i zFd}QoZJ!AxN6X;>wqBx6+DpZB$C-Fe#}TwS0Y7qQlRhh!yudL}l{6nnbw}MBKIV;L z5-^Vf^`NKHCc3?LC-v+;JbLwV`uOtS`@N$>1EX9^ek6$nA|P?%*@(}FsU6jjxjywA zy>e3y-E=hR%ZC4F`IeRT2IuUZg(vwm-1!XN-jJl^z<9T9E zz@^Mkh_ff$D#W6&eM0j!2@{qG-l6AE!j@c@Kje@>?BazMGE>Cgz6ELPjfl+l9m547 z(dxTQ0V1o)TU6EH`RzyM=<8{Bh6!eAqRWxRW<<4NNIo!BFDjLB?Cn)F*#HrA1t^*oP}`B19&74-Q_5|YqauXM=SF!EXdP&t}7eHG8Bk2h7U10 zbWU@kmW#&af*dNq*36ffSY#d4XZ3fCTsX3Xz{K?eT8-!%yZc}94)>r5W3tmU@vMc+ zM)qfAs0LEp6AEtPmY?hk@uBHeb!Ly3)+1h+1l@GkRJ@2nUe>}SD`adkb($JSTlz41 z%zCVepQG1`+G=BGAL$%@;3ed){HJYOC+`n>9!skh%VRGR2r~NNFarwIwR$*FSk5*4 z&9HS0BhEcze^K0Htq+Y_(cz#BXy!QUqsRiZ9mh9!(wKJzNj15g5df<8u6Ff+`?%aN zD9qw()`%1E{5IFk_vfXr;E6lrqq%CuZ6K25hqLJ62ir{IpYSR2@MmSt@^pv& ssh-ed25519 1uIO/w yC7gFdxtG9YcLaEJYWIv+JaGX+HQ1PIkcqm8Zym5TEw +P5EIqByUcH9IOlm0gPyr/fCrIEjGPHkoXBzpZqCtqrg +--- 9xCpuwza27bhMx5bOjQ1JTep+njEiiMqqBTB2HFiN64 +kO¾64W‡Í=L'ÛâRk­Èo=¶>zÙåÏ?ˆB­^æ!t{‚·qÂNûDçCD'~7¤î‘Ô»âA_h¶àÞ ÚêD:Mc½× \ No newline at end of file From d396c2d5a80bc7084ede0d12e9d52d3951837c62 Mon Sep 17 00:00:00 2001 From: Jasper Mayone Date: Fri, 13 Nov 2026 07:58:14 -0500 Subject: [PATCH 2/2] feat(selvage): add twill's host key and re-key its secrets --- README.md | 8 ++++---- hosts/twill/configuration.nix | 3 --- secrets/ad-join.age | Bin 1022 -> 1132 bytes secrets/secrets.nix | 18 +++++++----------- secrets/selvage-env.age | Bin 1628 -> 1738 bytes secrets/selvage-ghcr-token.age | 10 ++++++---- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f9504f4..a3a1817 100644 --- a/README.md +++ b/README.md @@ -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/`): @@ -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 ``` diff --git a/hosts/twill/configuration.nix b/hosts/twill/configuration.nix index 508d59f..e90b52b 100644 --- a/hosts/twill/configuration.nix +++ b/hosts/twill/configuration.nix @@ -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 = [ diff --git a/secrets/ad-join.age b/secrets/ad-join.age index 760cacce5bc723d226c723f87a6c8952debbeb6e..4467fac18c2341bf4c79ce589b0f0f82a4516377 100644 GIT binary patch literal 1132 zcmZ9|yU(j+0Dy6a6E97i&q|IX`2rSpGfu|I zm^c}ooSa-uJaKR^?jAS4xqrd$$>XQ-LtKaLbm_9Dez$2;WWW{=??C{ZAL3|95Eu<% zy`&*Gh(}AuRyC`E+i5(uK}2>AnK%tx@q6CLxRmne=sX<4;*3bp(2&&QZVE| zjKtIuLhHRVd*`gI(hk~jr zwr6e-xMpQa7cCjth7N@)R#971B5+kx&p^Z;cWw)QAW~5u5A+)7vCnQiVXoVGk2$n5 zq+s2Hv)W_9)#+LFUP~W`1v=!@CwnFDx7`LP7u}Xth@cTgDL8SU!>q}D2En@a8DR7FlHfD0D%oUqu1e9AX2FEqxjv{QaIZavkr4wG)!J85q0GD{EM|W< zBsxxtLx*t%70OG@;r$^dvlGini%e1lLU)i$iOQkXn~IG5@jeE~~_Z7?9K&e%I_jvN*0U~pJnB0uJ5YetB zH-2r>d3`%GMMe~bw4}FHbwZE4(HX17ch6oN|9=1bU;q1y`Q(qMAOHE|^B=h9FMj`a z`PQrCpI?6d`pFm1UVqtLncp<@_{9JHF4IDp0#1 zW{?0O!OF-7Ko#t4hygaXvQ>2ccX`*J^y=|ZG>dXr4Mm;Y@{ev6!rS>|_7uC{<5?5} zlAN>Hyis(#!$`PvHgW2tC(W30QIKWjDjr62zV{<}Z!Ej~WQ8$QuaYwXrGCJ9{Awb> zacC99Q#XWBZ?;>v!ifU|?kk<5FHq*WhZ>pcO9NqBqR||b3?w}AW9v~HRm{Spb0DJB z;x4TXYNhWgFeH0!LdA=4sF9{)$vzlK#IpH?CLU^|!)_OQ zEI~;zs4|-pO`6tO1mPmPX#r{O$h|vK^nmwD6x0z5h{>_#>gIgW%v90Zqz6*#uU$HQhj@<>Cv&4IV`YOFb3?3DEwl11s1;sTJ01&fEs*E$+xpny1mb_1DdcY?%B5B zvtCK=Af#J}#5l2TyPC$)c(Klbf7t2<&NT06=dzk}9M&B46J?l|XK&IbIk{H{T)UmY z?QKQbia1a%TNS^pH7kV^L`DjJL^j$`rF(K~UcLvx0?!I@zEOGU&XBjE$Z#a@-gz<% zrOfFtu@m`x+R#?uN`&AfCxSC|#U%>Z83+z@oqn27e zzMfqN(n>Rx8J4Je$|!|x3*S~Un_=^Vcekf~l5;1p7FOONEd_Rz;eC-i8FM(YHn-4R zx&bjU`R|i&CFaW)PyYJ!b^6DTAHS);f0=*PM~{ksjaN@T|2g{Li+|qy^3CJ-UViuf is}H|^`r`4gzyJLkseShB`RnPz{DJ=SQU4POF#CVv%TbyD diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5f9014d..fdeb67f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -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 = ""; - # 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-.age recipients: jsp, skein @@ -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, @@ -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 @@ -332,5 +327,6 @@ in batting weft hank + twill ]; } diff --git a/secrets/selvage-env.age b/secrets/selvage-env.age index bb45684991cb296522519f6b76e0032283cceb0d..500b62740660fb5f592d8fff54adeead62a7b1f1 100644 GIT binary patch delta 1714 zcmV;j22J_g49X3VEPqc#H+3^jdNnmOb#iS+cW!uab6R3^R#Y%eS#nEfc}i z3Wv-IStW_vZGUEsccFHPECiAooIcdzr3XagL>Mjlu|GiIF&oZT<${k% zIQxo7K9~Dg%fG%rgP?Y1H2bRwi=IIpaq$_Hw+Igvo-~eTT3gF?ZBOW4V%cv>49R0D zV@gZ`j(_^o*MR-~fKD-+yaq03g&I?4&&8_Fz7!?(AesO5PR29+6fkVo)UQsW?Rgg! z%+oBn)M|5WylC_34^09oCwNr>5vkn9NX-U{pvm>XAfgQ0w|eXbd5+8`LYHjoL?*-s zG8!de-|guTQ7GEX!>g}M1<>ugu-FnHjg1=yvwwKF=t$w=KlAcOuUlkx&KzalGvj|AIC60Bjkk9w_4SM>uWYfVURQMeUO=0YOW-b8V8==CxurwDB)Z2 zDMNqs1}u&7I*r=C6RG!eAE#uX(#cojsK-kbeNmy5qaI&Ko35(zj;kuX4PqTQ#PMhS z7k~7y^P|vVYft<1;p3{}>QIgs*LbT`pJ7Gc6oWI5amX zRTd=JRy-eqwDgLFImhR0H~_EAh9Gn1ne}6>PjyNvbF?hy%O^Vsqu{7BF2)96U)ea< zOWbqzx!!YfYmWeF1-D%@F_R&V=pFi8fsN=0D?=liUr$Pw=181?s^aW+mp#QGaDM<; z4EIIhJcuLKuZB_Tu|3S;lj=6&&Ehu>5@~^vNJ|&wdETRcnxKpqkQ#}E{%adlNRpLH zx=0V~+eI)>5NnkAdz#zOJrP0#>+xLOe$Hfnc@)MbFO}&PXR|kpOt&?=p#!=B_?6OA z4SvIlUD|q~tpwv=B?Q?U$Q8B64}WZ#N^ezO ZGcADYU!LpVU0zCJY3F4V>}f&1v9q$iR}k3t(I>1!r}xB;6ZOXaky(15 z`cV~YYB?Eol2M`hyxFY&$RTc7c)~Rob#%jh8Ex$VV8io1QTZ#|DloP)dw(R~I$}j? z-$YF;4$g@t%yni)?TUAQN7T{9oX-KPeCmg8qjWXTX~pP4^kldO8gQ81IyiqVsV$Cv z-=d2A%R;y===4BRGhv#hSQ68UBG-vrMZBZcCpXNCzB|4G{I6P-S!pK34zSxK*2l8w z?-*rm?p8F_8m%uae5if$Jb!oP3O0qiYjE(|!48!66}|R+^A~8n_+p`U-i54qQx!}F zMzO8Ia`A)CO8Op$9I&BZn*sip^#=l<1zd>%K!DoafJ5fF5-Ml=5Ls2G1C$NdovT)8 z8!1x;*K$#)VHIsFdHbtZG7J}7q(71|Hs*ij2atATaBEDsA2(-}vVWX0=t~iI7G&@6 zu5}MxXQJi+AU*w!8A$6sgSa2~bp%(iQ9c|wjE z9T7_kBoTxAljvs*&MQl7BtzC}N>LA8R4q9})}K4ifkiSIVSVVorTKmfpU;^*1uUkC IRP^q}U7|K0H2?qr delta 1603 zcmV-J2E6&o4crWnEPqE&W<+>YG&E&Pc6DntLsLdlcvmZ9bWU$8Sw~8AW;k+3PD?8> zGD&eVX9`7gH)B&uMNCF#aZNB}YDG|DV{=VZSxR(fMn_F~b52J~PftfgOJy^4RSGRF zEg(#3d2lf+Zc=hiRx342T1iP)cTYEGcsO%eR$*>uMp|cNVSjIVG*C}LNpA{<*n1|( zskmAJ11cUq0P^G~!{VRv*0-wG|L;f{L=}lq;fHlDEaj4Q9-yn*>Ve&@bL`v6HUElL z<5vf%e5V1BX3cb5v$ng7gYd7X+3D7|Km0{!mpDkBN!-W$d7p z6murGI60INu6M`733n6^5K7RK&dp&Ef2+JMn{kiD65~!|rDg63@iz{iqR?+I*FTx0 z%-#*Bd9evP(Q${9odg`0l(faUDjYW6&^7ZL`2=*>)_)M^R^jh7vgE!n-!b1<6bv-L z;ePANF_d2Kt6(wQ6`|EEgTY$Y$!`8aJ7-u#hPkN2)XU=kq*|23HX*9AwZNN4QbfM5 z{q)dg9Ci~BP}XPW{S@w3HXxoQ|8EIE$*nEG17^3ZLW{-L^{Pn*FkSeYRM?BQU`UGK~BM*V{r< zo}Nk{XW}PoZDzw$*DC@@Jq*O}pFCM5(|Lxcnt!*jpe5SLdtS?<$O2B>-0H9U8w?FE zuRAFX&*QXFw=8rx8@eRX_lpq~bI?kj$4{P;BdHC6GbRnn^esdc`DdvD&xwT3yYZ^G zH9D9MjJ9~B9hd>=pq;*gCYumIsKJ*nG@&1=lkJadfbE7=%32I`S8+AVG~+OY0DG47 z0DmQLSstH`KUg<0jZvPhN8rvjR6zDj z`?R5&e9J}j0!FZvgE$K2gLcs@y9`c}tyy1ghvE#I?J%B3De-nG+tcYf>jPO`XkRDc ze`wT;)B9D2Tz-)Xey^oQR^{|4DKH{y$$xF12_;9%;Q_W@qE6aN#dOD+cuvO=v^fDk za%Yo1E0(;#F;A5=A4qja-5WmUjbaioj{^0er_v_6y>=({>^?kt^>X_7^56TtqeBCu zTuXi=i3K7capKvC&xffU)sVS9^&Gu&Qx4s9H0jHR|7ZD@mG%bb?45-t`83@541eC< zkfh|mc(<))dFUsEF#Qr+JkBGMhCH~yrOZ%>vnSjt#GbpzuGm}31(@c&<#he zx)kuW;&#?mHUP~?X@CqO$I8w7Re#qe6jLB?Cn)F*#HrA1t^*oP}`B1AllV58dS` zyKA)aV@E6VEiA~>d9EuP#xfL$GlmZ_Ido2QqLz!s<$@e4z}C!{m{?>T)Mxc~j9fUf zguul00$Ppe8@u~o@ecQ(31hO;H1Vv3%trQSWvB*H+!G3J;+CK63-O`pRdr^Mm)0X* zm;~K)*HpZSLSELwBr9ZWGJkcN8b@3DFnY{-tcjna*NWO|V`m@f9DU#=+FA@kc`r$AG3e>fFI8j*6HT=!6bqpiUJ!5}S++(c|jat#+pbTi{IP0Ux z0<;~+H+RyQcLhl`xttLIs`jpS^?>`h+%PE2;%nB36Y%^t*Uk6mr97|Ti96(@xoX92 zAd=*Vv*_Um+f3r0@G0`}XJyXvbcg-pzG=X5y*I{lDjWL$sg6LH5ljj}MF1YnJ124| B7Bm0= diff --git a/secrets/selvage-ghcr-token.age b/secrets/selvage-ghcr-token.age index 02af931..1bc60bd 100644 --- a/secrets/selvage-ghcr-token.age +++ b/secrets/selvage-ghcr-token.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 1uIO/w yC7gFdxtG9YcLaEJYWIv+JaGX+HQ1PIkcqm8Zym5TEw -P5EIqByUcH9IOlm0gPyr/fCrIEjGPHkoXBzpZqCtqrg ---- 9xCpuwza27bhMx5bOjQ1JTep+njEiiMqqBTB2HFiN64 -kO¾64W‡Í=L'ÛâRk­Èo=¶>zÙåÏ?ˆB­^æ!t{‚·qÂNûDçCD'~7¤î‘Ô»âA_h¶àÞ ÚêD:Mc½× \ No newline at end of file +-> 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†{ \ No newline at end of file