From 32bc1e83e9d1a9c0e37b38749f25c0861a6d3ae1 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Oct 2026 16:46:54 -0400 Subject: [PATCH] fixing buzz pairing --- hosts/hl-minipc1/services/buzz.nix | 21 +++++++++++++++++++-- secrets/buzz-env.age | Bin 1508 -> 1456 bytes 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hosts/hl-minipc1/services/buzz.nix b/hosts/hl-minipc1/services/buzz.nix index db973f2..74fb1bb 100644 --- a/hosts/hl-minipc1/services/buzz.nix +++ b/hosts/hl-minipc1/services/buzz.nix @@ -6,6 +6,7 @@ let domain = app.effectiveDns; publicDomain = builtins.elemAt app.aliases 0; port = 3000; + pairPort = 5000; ip = app.ip; bucket = "buzz-media"; images = { @@ -52,6 +53,7 @@ in BUZZ_MEDIA_BASE_URL = "https://${buzz.publicDomain}/media"; BUZZ_MEDIA_SERVER_DOMAIN = buzz.publicDomain; BUZZ_CORS_ORIGINS = "https://${buzz.publicDomain}"; + BUZZ_PAIRING_RELAY_URL = "wss://${buzz.publicDomain}/pair"; BUZZ_S3_ENDPOINT = "http://minio:9000"; BUZZ_S3_REGION = "us-east-1"; BUZZ_S3_ADDRESSING_STYLE = "path"; @@ -70,9 +72,18 @@ in start_period = "30s"; }; }; + pair = { + image = buzz.images.relay; + networks = [ "internal" ]; + environment.BUZZ_PAIR_RELAY_BIND_ADDR = "0.0.0.0:${toString buzz.pairPort}"; + extraConfig.entrypoint = [ "/usr/local/bin/buzz-pair-relay" ]; + }; caddy = { image = buzz.images.caddy; - extraConfig.depends_on.relay.condition = "service_healthy"; + extraConfig.depends_on = { + relay.condition = "service_healthy"; + pair.condition = "service_started"; + }; networks = { internal = { }; lan = { ipv4_address = buzz.ip; }; @@ -81,7 +92,13 @@ in ${buzz.publicDomain} { tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem encode zstd gzip - reverse_proxy relay:${toString buzz.port} + # Only /pair goes to the pairing service + handle /pair { + reverse_proxy pair:${toString buzz.pairPort} + } + handle { + reverse_proxy relay:${toString buzz.port} + } } http://${buzz.domain} { redir https://${buzz.publicDomain}{uri} permanent diff --git a/secrets/buzz-env.age b/secrets/buzz-env.age index 29c375588ef30c813cef1e1979299d58278d78f8..cfd6b28d3ced2b7a0c09c4a93762f1882d95e916 100644 GIT binary patch delta 1430 zcmV;H1!?-^3$P22EPpaaS7l^SSu;aUPH8nrLU~00Hdk|J zQBycUSqfrtQ*mlcX*Xk6NmNNTW^h$vGEbMG7rG zAaiqQEoEdfH8n9gAWU^iPEkQ1Nknr?V?WHD@23S~`ccS%_*HfwEESU5&RM=)1Va5HgDY+6lIXE8ZPN_TfpXE}Oh zIc+OZ3N0-yATMrsRXH<3FKJVFGj2;(YI!R~IW%u^G<0lbGEF#Hc3M_KMQ3&^NpWv5 z3hQZl*K3en%zxzt@}ECnfs$3FDG1a-kz0Ylbd#ee*J-Za7qEktv~XQzEFDIk#_0}v zxi8C|)k_K840-J^Qogjj%!o1l-&MD`d2*1uVwyMM=)#xV4y&TaNijv~-R4R1#bO@g z3^MKvSi{Gn=c8A3%dLqa)^+X;M+eKpS)LWf$MHTD4u8$wyFk`r!27@>B^T^I6XfZ{k8VkCmOd>=tA2t+RMzB{5`7tjIKSr0%o6mifqjrL?A z%S>jVHA0^fH0Y`)GP_vjGyNK{Ui z`XH}o;eRW8K{CodW*uAD*-A=WQ!Gw3287(VnN&f{%8FremT1A_ zs+NEH9=W0{T&n6w?Sa{+mQ*y?jQpA^Ql%y5cz=$5VI)>G`Uo;NPjU0Zli8%1{nhp3 zu!Q>8A`y_(Ew^0Ernns4qGX0{KAQu^UZM1>u{vMfcJ%+0kq05pvCv8d0;iNt&M^9m zrO**SYQo*=LUB(0-bZZm!^_MW*~BVuS=EA94QnT!B7ge3qP%#wR*|aC7K-RqqJ$p= zs(%RX(E>V1;$uwFj_J!Cc~NKM8R{F*OMk{9=mX#8{PIc?b~tf{3f(`J3F!4^QbU(^ z-T{cd%mL0=?3v+|$M~j$6>Mb(5M;Ty57*?06=T`#-GzGnHEK8hPX&fr`8~6qAEM`_ z#B@^zgG`Uq?5C;CUG3J^BV_ESgv|_o?0?xfol4c=wsHG-K2zPzP~p^vQIk;B?hZ4? zsy%F5KeP@@G(&)yifa#S;3 zO-mpuF}d$9LwS!9aYxcmv8EX)iN2^k{iNy~xwBye(sNJ8M_sn4J?2m>u`Dk6RsP{g zGyw-O$Pm}c_W~eNEJVcuOwaM`cz@lfM*C~z+(`b#{vA7NNJ)YYOzFD%Po9|KgbFH( zgA_zYq{*6#+BfibGB3g640wg4^G_!XyUpA9N-a;~v>}q>-X$i6pJM7pi(Nm*Z2XiK zC4R9RgDm7Z#wDozr90fPd6#hHf8lYkI$hV5tRozHi0c{PkJxtI)ym&qFn`{F%(G$# zG#S*C+!z kkTiqcwBo73nlFj|9(C_D84sJ=ap888%6+xr>OyGbC}Vi0-v9sr delta 1482 zcmV;*1vUDx3*-xsEPppKZBcnoPijR*XfjTDQfD?=dT3EIVQMROF-k~bLThnzGD2E$ zP*rL}V+vAlG-gUMO?6{hR9H$&W=M8tW>+^dW_om2FE~&#SXEh2ctmV=Wieu7NeV4K zAaiqQEoEdfH8n9gAWU^iPEkQ1S2bEUI7CTvFEC_yQZO%VD}Pr@OKoIsR4_DASxYxZ zOnNwLYj;OPRb(+)3N=S)ML1b^Qe$OucrtfrI8AjyS5IeED@;mNZ$(vbVR$lZV=-}b zQ+hc#3N0-yAVM;1L{e&DMmI@%W?55BX?STuO>Ap9adkmvc6D!3LrgJxR(e-cOKD*= z3Sv7EQ~3=05PxVp6fG~GTM%oEGFV3)X-&6JL2T-wVfFa>C8e1k)mFxd&3fx!=ki!u zO`a-b)W0mcKfW6MP=)n1#o{yoQi4e`U2{Ffdmr#~Hq~CfD#B#S4H|x0*j!bRE1@Mn zOeskJNvH4%-vw7ebSV!Qp1H*_tISe>WLRVL*n+n?t$#&L*sw@*U$;PAhQA~v_v~~Z zKWFrN6jh{deskJ!1pBPf!Y7(JaSqrTR#8!$8F3Ra!c6NIzkqmLUrNvAzxaHf*5mp zb;l<8Z-2(JJcb=yqk8e2ciQ8}>fUUL&D1vJjds>aTxEYRZj>Tcg@b(CvyYt>parhw zgF&|kUhO~Cfo=;vDHKJ21o16Xc87GJ-cLW=kFwvuTiOB?`y>rz=_uQ3RGdFzN(K*Z z{mWOdw;$5w*l#jr6pSYGb1_U3;_cAbYf(mVlYbc5%?Am3p9`366Q#$i?bkFj>@vJ| znl?8$*;uU?n|a(+28T?Y9VvJyyRIKo$+~FbbgYe8eKycVPq2;y9p~wf40Cr}(Qd#W z*eSPsPrQY5$Ym}-Td;LUufvlNr}L%DM>m@STiS`sCDO`##vOb@_)_?p4N(&j7l>;emTL%xq~7u;J^pLkw*$pnn~- zZ^AdSi+_dd)f$M5gW?v8OGswjZi|N{@MyYq)=jHnE(rE1g7_ z=ofIv93}=FXlA)8g6bDEjiqL@89NYu;n-7ty30U#F$M;1DA@F!mq$HDm%HS`w|;w? z8>;ePmy>{b;Y2i9dHWjepN3F`8-Ise+G(I(zRQpz^@C?NMV2yLV5;>#$kZa`;?V3} zNp8+f@l(zB$(UW| zXp*_74UmDYPWyL^FrS<*%Rjrt%CvS-jVg|2VEflmL?m8<`CM+l kc}ooMFG|P{*q4