From f2f79d8a4db54038bf8f43df2aee6fc7d418ca78 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 17 Sep 2026 09:58:35 -0400 Subject: [PATCH] undo macvlan --- flake.lock | 8 ++++---- hosts/hl-minipc2.nix | 16 ++++++++-------- secrets/stack1.age | Bin 977 -> 928 bytes secrets/stack2.age | Bin 1926 -> 1877 bytes 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 641c37e..4c8c17c 100644 --- a/flake.lock +++ b/flake.lock @@ -831,11 +831,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1789573245, - "narHash": "sha256-Uw1DJF/XubQrnzjPftoE6yBGIYKQ1UjMYpG6k2ye6VA=", + "lastModified": 1789611307, + "narHash": "sha256-iMt1eFWfXTYKTDdRvUGrVACU3GRTKUzpvxf87OPLhHU=", "ref": "refs/heads/main", - "rev": "e5f150b17e3ac19b3082246734741885fb141a2d", - "revCount": 18, + "rev": "f5f6a98152c7ce76deb4ed5246ebd5836d40c815", + "revCount": 22, "type": "git", "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" }, diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 25ef84c..97fba9d 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -96,18 +96,18 @@ in "/var/run/docker.sock:/var/run/docker.sock" "portainer_data:/data" ]; - # ports = [ - # "9443:9443" - # "8000:8000" - # ]; - networks = staticIp "10.0.101.5"; + ports = [ + "9443:9443" + "8000:8000" + ]; + # networks = staticIp "10.0.101.5"; }; volumes = { portainer_data = { name = "portainer_data"; }; }; - networks = macvlanNetwork; + # networks = macvlanNetwork; }; age.secrets.stack1.file = ../secrets/stack1.age; @@ -115,14 +115,14 @@ in enable = true; autoUpdate.enable = true; composeFile = config.age.secrets.stack1.path; - networks = macvlanNetwork; + # networks = macvlanNetwork; }; age.secrets.stack2.file = ../secrets/stack2.age; skyg.nixos.common.container-services.stack2 = { enable = true; autoUpdate.enable = true; composeFile = config.age.secrets.stack2.path; - networks = macvlanNetwork; + # networks = macvlanNetwork; }; # Scrypted backup timer (image auto-update handled by container-services autoUpdate) diff --git a/secrets/stack1.age b/secrets/stack1.age index 0ebe7091b3452103cd3e1af4d9c360d34a07883b..ce525f32556e395eebff0d6f6ca73c5bd2b1ac53 100644 GIT binary patch delta 896 zcmV-`1AqL{2cQR#Eq_Z;IZJqCcTr4YL`-xsOE_?1Q$|BDFH3T1Hf$?UMoM~bMniOI zSuku(3Q|UBMl>^1Wo|YzcXx7UX>)H)Nn=HJN=I!kGBZ!uR(LO23N1b$ zb8~1dWn?lnH8D9Lb!RJcO?M!8M^967NlRjJIc+&GGE+u0Mt^TqV>D7Uc1cTDRdY>Y zGficxrZ6Z*Vb7D|c39PDxZ!OEFS6 zL^fv%EiEk|Q+G9MRZTEXa9M15Npf&-LTEK)WM@=FaZ)dGWLP&cMp|T9K{Z86YD6#! zg*m0MB4ycKrhh?xjMm4j{C4YREU9M8u5!l6&WNS$sGvf~Ot8z({F6zJ()%FdNJ}%m z1!1vH{})(M5Z$E@Mms6FSBVS422*WTuCnwzMl`UAXdU)~822T@h{pEX5?VfO!v69cDz)*;!@s9`JXd@IT?1$ZvT0^RaOFXh{TCMbDB2KQnRy4Uc-{@ z-WP~b-E3Ip8T#FUFAa^ZSVChUw9yw_3U6B&C(?9c!t01D`}l@m`Tn;D19%LH&JNlaePef+cCkg=vkfsD%?&9_{BYrsvXWALgq*TxHno#_)TY~TcB~%X#N4DcP^#9m8^@lH)ijJX=lyOy zWO-BPg>`*(!M`X<1`2Imah^XI2?6{<^_->% z^u5Qx1!n75`?=e*VWmI{Lzc%H`>s$wfaGn3tRwD2@c5dmMyeU`8o9xOvKUlkD3N8e W!dZ;iMfW#ZgYw!#vKoE*bxI_9C7rtf delta 946 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 delta 1903 zcmV-#2ax#H4u%hqEPqUDaClZ}VNX&?adR_JQB!(VWo1@)Yc)wxXk=k-S5J0nc2ZX~ za4=|XFbYa|O;t5oaCtd+D>6byR#{U}ZZA$VT2yOVM`B7$R(WelD{gOASyV(tZwf6w zAaiqQEoEdfH8n9gAa!Reb4_<3aavAocWZY-IW#zOT1{k9IDbVqZ&Wl;Rz^fYMnY0y zGb==DYf?%_L198~3RYNEWphJlIdEBRc2I3NYdCR9OH5`lcX)Vqc2jOgc{X}0Gfq-& zSyD4+3N0-yAbCneF;`JeRX1^XI7C=$Ms;a)VQedMP|6O9qBQ!d$~RV1SfPJ*2%z<@ zAgmbFk-Co&17ba>>tk9Hr`RWopA!!W3a)6J1ei*Y&wpvfj%Zx%ewn0!&&5o@Bh20| z{I$xMtKRiKh)t{<`({(;ntR$}WZdM(n0;knZ$1=pv(`nPmn&%-7lvUl6@7K`eWEm_ zmgJ!Y*%2VxWG~98)*Qrss$1BqfTypBSR5@2lYRFbs>%4sjM)R>TK5uvV}M#ru15ngY52>UEefpEef`bJ7j*03r(L)=a~BB|rdc`rw3Lf5F8(SO7-X^|FPFQo>jCVklPbjP85S#RXkLOKH%hu2VN*}=5WKv%i=RH)EPlZ{+$%bB4ASpRw4{9 zZht5@RS6u(S;W(z^a4^X`-pDgq#|kUNgQOUkk7I888T|ra7V!?AAlib`|rTly+7MX<8V!#|$kA0CkzANqZLi`o zJZ&ehJZ0ykh-B+)%HGy-sezb}A!M@29^xkHL~uX|jOCmp>%F^ViNc(7qD>Zuyl;lK z5v^D5B!H;>6uq`TwxBHB_YDK4mt%MZS;f(4a|)>AfcQaCLUWnx6ct^hE?)gmRDbAM zP|beAqj$Vl&ZTl*Oa~FZfvTFd^&v~ARtd%;?qoDqe`@4}1b6rSsncbvlwj}3nR}Y> z$^tfX~_zg0e`A z3O!CL50&q_++l*@3D*;-;*krMZ-2IBwgiTlWsuKBKZ<}UeAU`wzWR#J_*TyiF_yyv zPoK`L$WLgll)gU7UMYj*?%PEEXS)QM$m2cYg_aFT$HE!NDk}SBA82oTkg_~}Sc0y! z2v!3(!(|powD*#>2b7ElppV&eQ@Cxd`;oCJs(9GG+6)bc@Lye!vr#TY41awZFf1nT z-LhkFFo)chm?FJ-91a}E!2RwFn0dC=x+wC^b-e=D`X@sUT~+xBt;t|QD5{URz=K%} z3H)r(A;%gDx73vt$rR$Sa|2GMdTOC5rb7HJIwnSa^t}oQ4!lpR|0b`XIQbGP(a{&( zM}^(8Nu)SLS0xyV2EdHS#((Z$$`WqAEEe{s;H%?E!ywrru^=f4u9XNCD#8x$N~&)I zoFPG+>NQZC1Cr{h+&P5s(+gJhwTT>liMsVsi{%50`FqsT9E#S*I-6{Xg!_%zXqlNQ z%^6*kVC5ygQKx4{AQaxo-Pwb4ircM|*h;by;P45!!lxWR=lfdSet#S1z-OZuvQm#5 zfi6nh(`6$CV57Y!RaM_H&%HJf_A1wjD*bBW53`8l7!373uxkDfaH3&=)JXM(71A3_ zV3}ya;q+IMoHLq3h2V#D8gmGsG-Z$I&Kq*1u&rS%yf_hT%V0TaK<}azsr%tN(jNZh z5Tj571X*@lwsI34>d_43bA6zq*lv>)J$a81g*dNZ)05mVmqKo?bXWXN z)J+mmj=~|CAcjgwe4I>p&9rdRrQ_+0^c%l^@jL(3IB_i5JQrJ`gH{N0#%66rvUbg( zk-t#r%du(im9w|N;|f(Vo1zYo+|GH5J%)q_ZRQeJz_4u2rD&$0@n@zj)K98FQ5Q7b z@VUY7uowTr^ZUQ;-&CG*{rfM#_}Gl~8PSuH5E p(39X7QXl*aKdXWp3JQWC2zQ#rVE$|cDuoroZ8KNlsQlV