From b3304c0ef59cd493b75522a76faf2bdc54a214a7 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 25 Jul 2026 11:40:35 -0500 Subject: [PATCH] chore: migrate to Garage --- hosts/unstable/genesis/networking.nix | 2 +- hosts/unstable/hosea/default.nix | 2 +- modules/nix-conf.nix | 4 +- network.json | 1 + secrets/niks3/access_key_id.age | 76 +++++++++++++-------------- secrets/niks3/secret_access_key.age | 76 +++++++++++++-------------- 6 files changed, 81 insertions(+), 80 deletions(-) diff --git a/hosts/unstable/genesis/networking.nix b/hosts/unstable/genesis/networking.nix index 68b3185..bf52637 100644 --- a/hosts/unstable/genesis/networking.nix +++ b/hosts/unstable/genesis/networking.nix @@ -133,7 +133,7 @@ in file = makeZoneFile (lib'.hostsByNet net metadata.hosts) domain; }) { - #"shire-zebra.ts.net" = "tailscale"; + "shire-zebra.ts.net" = "tailscale"; "nebula.thehellings.com" = "nebula"; nebula = "nebula"; "thehellings.lan" = "lan"; diff --git a/hosts/unstable/hosea/default.nix b/hosts/unstable/hosea/default.nix index fe9748a..864c0ec 100644 --- a/hosts/unstable/hosea/default.nix +++ b/hosts/unstable/hosea/default.nix @@ -185,7 +185,7 @@ in s3 = { accessKeyFile = config.age.secrets.niks3-access-key-id.path; bucket = "niks3"; - endpoint = "nas1.shire-zebra.ts.net:9000"; + endpoint = "nas1.shire-zebra.ts.net:30188"; secretKeyFile = config.age.secrets.niks3-secret-access-key.path; useSSL = false; }; diff --git a/modules/nix-conf.nix b/modules/nix-conf.nix index 09aba40..f995d95 100644 --- a/modules/nix-conf.nix +++ b/modules/nix-conf.nix @@ -62,12 +62,12 @@ in if cfg.cache then [ #"http://chronicles.shire-zebra.ts.net:9000/binary-cache/" - "http://nas1.shire-zebra.ts.net:9000/niks3" + "http://niks3.nas1.shire-zebra.ts.net:30189/" #"http://nas1.shire-zebra.ts.net:8080/default" ] else [ - "http://nas1.thehellings.lan:8080/default" + "http://niks3.nas1.thehellings.lan:30189/" ] ) ++ [ diff --git a/network.json b/network.json index 29bd01f..9b24aac 100644 --- a/network.json +++ b/network.json @@ -118,6 +118,7 @@ "system": "aarch64-darwin" }, "nas1": { + "aliases": [ "*.nas1" ], "external": true, "ip": "10.42.1.14", "ts": "100.114.187.61" diff --git a/secrets/niks3/access_key_id.age b/secrets/niks3/access_key_id.age index 903266b..c7e3db9 100644 --- a/secrets/niks3/access_key_id.age +++ b/secrets/niks3/access_key_id.age @@ -1,39 +1,39 @@ age-encryption.org/v1 --> ssh-ed25519 87huqg KhFW9eGOvYn1vPf2pFT14gVRq541ofnYw1cNvC4uVGc -sS4HTnBrzKvHvlKQjVkiNSSAEjjQcm+a354L8sdnhsA --> ssh-ed25519 8UnW5Q C/QY27AzEPYpgJyb6/r8p1tJJmEAgS3RpIt4Etl0iGU -UuZDLETE/QmfH0fFYgbVPZ4eia0O8IrKqhzJa+SU7CM --> ssh-ed25519 UFfTmg 9dyTEWMxJzAK9PKxnmTjz5pw/Uhr5zAiOUAHJ/ev/Tg -swWSAFU44wzwAlbUYWFBTXO7SSods6yX0tWSFVe49aY --> ssh-ed25519 KbVVUw 7UaC5EtiONZDzOQa2YTuR0iRBPfJJ19oVWK3/rrHXgY -QYYqkcuEQIBNdARJAfrCXcXyzAwpz1C+peKCWkfQJ4Y --> ssh-ed25519 xNtnoA pNNFt0R/qAVeHR3/DmeiwgUmXjN6oDUb2jvsGIxmm2E -YI5qJKcrsU0Vo+oaTeJXQ2jI7iCOjwbRkXEZF2YYP1A --> ssh-ed25519 aY2AXA gdWMIcJ9ChhRBT/WUEnd1q1ZCJy7pI9sL6vFhgxryg4 -EvAw+/+s2+C7bwWU5TwrS9GuYHgMdNMgFSKX5jmfWS8 --> ssh-ed25519 AQhf1g Ivjy3sguTvXDqPw8FMXUtGfrbPL8hiArWZ/KoePj5CQ -Iu6SU1iYiem7pmP+gWKTm7pKumop1z2CL6OmgczOt9E --> ssh-ed25519 mOmPfg Rd7l3ioovxGH31WAmTpBBRGFTG5lihk84y8pG3DyXjk -n0fDOZSQNHKN3a1xaRssLqneJNPsZjPLjL0QELg4ssA --> ssh-ed25519 YJiRbw RcfqjsOe4bRwjG2/YoRhbBR6NbEF0Ni0i6AnOP+oHzQ -pUC1ZMfKknSrmFHttMsZAfY7VC6fNeOdlivcthAgAxU --> ssh-ed25519 Nl/5yA ZdLXWs9C7XMfzti9Ak396hEgXfAnV4Hbb5brcaX24Ug -EufbMR2YRdriRnQRxQQg8mGJkLwLcyLlUc8+ytceSNA --> ssh-ed25519 GdLgCQ L1FKNfwNF2gPf5wAxzZWNYA2WOBA8i62I6LjnY7OfB8 -zhx14JX8YEhWjIb2eIrEYqve6htHWv22L7FwwboC044 --> ssh-ed25519 tOH/HQ GY/1nroQp3Jt+4ATQR1L8uOC+r6xq1b/wJ45zkokL0Q -54YPHGcrgzyHzbY6baPV8Ju/XqN79Gcu6u/PD0bo9eA --> ssh-ed25519 FpzvfQ fRvLLmzaW2/320zyWtpK2htWgng4nWhUnW47iGDjIRc -yJyXA4n/a3qythPeRL8NGXRZ8Y3/pz8PlaIj+I3pL68 --> ssh-ed25519 2UotMw jb5C8jTe8RhImtPNzUiMnFW+xf6f99XYuijLYxnUi1A -lA/bNQTjfhgLyRjeRM3wejmmjC2DqIlSS0qn3I6PEzc --> ssh-ed25519 kdPvzQ Q7hyO0rTI/wr8BrfXiHZA+ujVIL6w+j3aVnSkdGLlm4 -oNVqGBJPcDHgHizWysQvqQfJ2f6iD5IacPcxzmJBWhs --> ssh-ed25519 onmXpg T8lP1ZTrAGmwOgT7bejDVmCV2D9k2h6mw40fpKTY4zw -/Mv3VuImvvkZytJA1/Y2K9XDA264X/PQGtsyE0Yrg6o --> ssh-ed25519 CnhD0g auUINOJCbTVld0bdKns6Ji9gQSWOOSxCtOfbM3P4HXI -zdUDBVOBlEBAJadKO14YLO6UisMiMv21J2Rm96nxTp8 --> ssh-ed25519 4ep2UA KdHMDHmbWwJKMPJmKIiI+8JDwyrzMjqhW6k5IFstLDc -9hjzXMhK8rSecrpiHLAawNGkbYPJuSArlm+yCVPAUKw ---- Rgm57Md7EwJLEKpUcHM9SD6b13tW4AGCstRCa9eke64 -4΢4DMD`2)?ѪMCicү \ No newline at end of file +-> ssh-ed25519 87huqg uqMgqwOR7IJm+N5uscbx4ovLWJCquF6Gjrxulgm8dkg +6HndQ6cW9IQRkSLpZFEOAefGFlhp3uLggb1opcGC+aQ +-> ssh-ed25519 8UnW5Q ypxChEYvyybsHwPzIO2WwUDzRfcJyutIb91UQ0yBRmU +MoQgg3DDQN3Dc5fIKHpbsB2Mcst6xEojMm95Z1vLFzY +-> ssh-ed25519 UFfTmg keUoHrc9VBCTUENQR1wocEyq1mNzbxALp2jkLXIiK2w +lxhB9wi+a0yCVY6rOIiFLw151qyxcXMemY8oGC5gEus +-> ssh-ed25519 KbVVUw INW5jwvYw77sJAVSiFDNQ5NYcwdgWij1c+6WUtRgd3s +MOtNiI27YsAnQ1BeQLJvXf6eMCDgAN/fND/y6850Hxs +-> ssh-ed25519 xNtnoA 19pWK/631rpQ4JS4daD0tENne05fcLGHdD6YQOl8wVg +pGLxO9vucXZnPLKCCeu4/KZDM4hMVqu3Gh8oh5VwHs4 +-> ssh-ed25519 aY2AXA NdKAa/VKtjMKETzZMt0YawGTqzshOBpkQNgt5f8771o +LMKP2zEV2cydvbQ/E8MiXsU3xrXeXXw6P/Ndcl+vENU +-> ssh-ed25519 AQhf1g 08Daf6qu0BmdU/NS9QxUcgb+pnzwLxVkHJ7nrdxs23E +b03hemLH66hKIJPkbs89DCvp7DZvZr9Q30Ta/cOWZrQ +-> ssh-ed25519 mOmPfg 4p2vXuNGm8mCPF3SeCIU36vVbW3i/MUhVctJ4o8vf3w +Q1oMzDnD4VONY2ScQgiKwV30aLYgcc73qYIYGXbjswU +-> ssh-ed25519 YJiRbw pmp8bCwDkv3kviK30FmJcW9VTRxYxGuSN2Pbaxmef18 +9IheH79U5EEXG+0TFDac4j+WoVWEEW+Vohdmdsrcago +-> ssh-ed25519 Nl/5yA gHtH34WMd0251AFHOW55TMudYIZIvXH1aiJ8ZiMfiT8 +t4z0Pd4URkdgaJGe1Kl0XF2ZUaicWaGcvO1LMMAqfM0 +-> ssh-ed25519 GdLgCQ EQ0+gouLga2Yh3fRQ4qCeY+s7qqfeJZWVBDgwzoG/XU +tdCF3s3Vv4MNo9TbOz02SynFwsrfjDO8lFtLUBTNEyw +-> ssh-ed25519 tOH/HQ 6wVzhUjLO2YfVnQKkg+hI31WSRA3xk87O+kOAoOqKRs +/39obhf0sfe8AqlTpadNyENmcYAyDEYZd3wcaVs1hHI +-> ssh-ed25519 FpzvfQ 4uQWb9Oz0Bn7u1B5PMVzU+wuQhkEKXPdK0zjNn9NMGU +d/0DE000EGI0Ila02tdYD7mel4L5U4reUsilQ4srTj0 +-> ssh-ed25519 2UotMw yrvNBpMJ+dnyM+w1spLtseqowk7lFQVKN/3yt4Np8hY +CxRbxYDnuCbNPA5GbbjsBMxDgnXsM2iAvAbwJcCiJ54 +-> ssh-ed25519 kdPvzQ 7hpe/4mR41xHp/IWYJjDXKPJVGzPxCn0B8wiad1o5AY +yaNuNBwA41qum2/i4IbfZsCYL82nbU0ErHfqo3ps1cM +-> ssh-ed25519 onmXpg JOKiwaMqLxFf/9NkPLCi60u/9xPwMTlANATtwGUVkTk +9/aXatlLCH3YkCGhOqZXlxzpz11nr/uPyt7ehuFjwIw +-> ssh-ed25519 CnhD0g Ftuqrqr+3Xmym48ivbNknQnbFaqV+VqAqwz2/Hp6sDU +v/sA4a3po9uXb6hf5ml0DTanDZ9Bq0DZL/9KwwimdUs +-> ssh-ed25519 4ep2UA GFzncnrzcVUTyxPH0wdC9e7BZCGK6WYf4HckgB43NzI +fvF9XM8sUGt2Z+eTmV9NnUe2AC4KN8kKSQBZn372AqU +--- XWIaBNq6i9kn9Glg42rxmI96r2Gl2ABW8ofv3qwGs7c +{,~:hk0 GĈ[!&J{UV+ \ No newline at end of file diff --git a/secrets/niks3/secret_access_key.age b/secrets/niks3/secret_access_key.age index 4ac15ce..a10db50 100644 --- a/secrets/niks3/secret_access_key.age +++ b/secrets/niks3/secret_access_key.age @@ -1,39 +1,39 @@ age-encryption.org/v1 --> ssh-ed25519 87huqg ItInPHR2vmAn4MRR25PpQGcZmlfUZC6ZFBK9Dm+g1HE -IIu0Ajhyaaip1eWaR8xhRVmfaknTIMmDD1cReirBnK8 --> ssh-ed25519 8UnW5Q AqFkmbjjgERpKRNV8XK+rZfZq4V2aY9mtLZlf4XkGkE -hasw1yrcKAqJY2NEDGDoovIEQHe0yJOqRNTNYX6LENk --> ssh-ed25519 UFfTmg FrDFbvfZam1HKr70fDqhkibu8XEmeKr4t/tDOQU4RBE -4BHgJLZBj3BeAHfTtoAz6nB8iftybTStUaO1y2HEkqc --> ssh-ed25519 KbVVUw etSns3Pzo/L0ydIAHZexoaGJXlEMwSJbfx7UQbj9GTU -zb/1xwa9RphOZGNJ2Fc32Yk697Sy6wefiXEncJnGnc4 --> ssh-ed25519 xNtnoA EzM+/+ifiFZjeWm0l3/NssbHTE3orGeTuhV2k0u3J1M -mZVkGmJzZdbrYY4YfKaVc5BJhs9KiZ5pGxu1OH8C89s --> ssh-ed25519 aY2AXA TY1EGJsucNR0s5loet7/TsYskr3epHqa8tEvg55rHCo -15M9b3HsAAnPALujKiR5Fcb/BLqVqSVYtTDAL30kwE0 --> ssh-ed25519 AQhf1g zbfFzkxDaaolgZSizx0bstCPvqFOR/11VctBaT47AzI -0oibeY+d6XfTuNqLI8Pn1yHDcA2wDYYoYoXYhj6WdRA --> ssh-ed25519 mOmPfg BPxfxaaONbc3TtjNEQgLn9WL7JkE4FJ1TvlSP0cFLkw -QVfSFloS8oo5z0CjR7ZPUlz8lBtpSGY9vRTs5uYyLt8 --> ssh-ed25519 YJiRbw Oo5v5Fl40mLDXGdXYGm0jsGzEthMowW4NoG5AWPMIQg -gkP5RbLpStH3jISlIovFshfE2iVSe2ctOvtr9BWvkqw --> ssh-ed25519 Nl/5yA nVx+FZ4FBmOEpua8TZzOucMRAyMNj3OSlFGhQFijPnc -Ipb32dPsO94RHGu/oauDLITLlkZrxgiApz4mMzItZDY --> ssh-ed25519 GdLgCQ ehP0tCV6lB57FbfSxTy8DfNLjBPkv4wzIcicI765DQQ -USzVtktOsm/w9Afz+Ppd08RzEeThTxywVcmhZ6AOZW8 --> ssh-ed25519 tOH/HQ bvq4iYQBWPxOAj1qeMfPkCpeEozmGVxkY2DN3gFUtF0 -1ruJciisubcde7I2VE62LSXbvYTFWVY17UEhEBuEC80 --> ssh-ed25519 FpzvfQ G+F4bO6zIKuA1sBl3KLzAI1S8AdA8cu9czPJ+kz1O0E -s3J0dJKcrG/ut273owCfqJ+Tag7ke2t8Iu0EQp5eJqs --> ssh-ed25519 2UotMw +C6ES14jRtjICliB4gEp9lLJsY/xE+uIckiEy420KUc -V/4Zb+pWxVICZeCRj2fWUS/hQfPDYpgyfGU7vn63Iqc --> ssh-ed25519 kdPvzQ RCGYgjKxjv4DVB/BOyHsGhyNacEp9p+kughIAondOzo -L0T1A/RkvJ3pW3Mj0JsQFF/7QLBjsK2gJhw2FxchWWw --> ssh-ed25519 onmXpg GjVyA2kOKsvUiIgO9ki67efMwfSFyFcBt4e5w2lrtng -sdBYFLHpIUkCUouMk5tHwtUTS/SJkiNVCt8xJRuyu+M --> ssh-ed25519 CnhD0g iUXFPOlBytSYa09T8VSwVUpXSMav9T9w/8aFe+pFEAM -NtTN6f3klptMllcxMFho3gsF18l+kL9sN62AhxblUqM --> ssh-ed25519 4ep2UA keVLcb19s1eHYeiD3YhjvjJc7kwkv26MllfitmN+bms -KPXcGRdz4XqcZtHm6quhpgXPr2k0TGZlURXmM9hxlLU ---- wnpQK1X7f72+ia5EcxLyXF4up3elQwN1TcK+wDjtzNY -.D>\L z2ȧGp UQl@5$| \ No newline at end of file +-> ssh-ed25519 87huqg 9rkVldDRoOFIgO3JjpjkAmtqE2nEthiq9J7pDmpGmC0 +Kg0fN5CFYccQGD5g7hWdXp7SPya3AkYoD8iuMc52iPM +-> ssh-ed25519 8UnW5Q hOIsJkaF0qdJU12X5SF/WDqsLktBHCij0lLgLPn2enw +xy+6qzuB4YuOz1qiB4nYC+looAOe0FjAGFYkeFAzPAs +-> ssh-ed25519 UFfTmg h6whFj4dl2whJMnJAjgmeVfLr8zcGHwI+rmSl8im3Xk +3+qSr+lM6G2f9RMLOY5cV3LikHTt8oRHjXgJqHtlBsI +-> ssh-ed25519 KbVVUw UdNgqODpvbkeWX4XdVE+ixr3FwMOOzlL+46sPJpGxic +YmcGQtye3UgBSt5VA4YlE8WnF6faSdLpM553c4/uEGU +-> ssh-ed25519 xNtnoA ET/B2KPCRjnSmYI/xjBGw8ahsbsK9pHcXrGTXIJgQU4 +WzZ/0Ym0FaYEZLlKWX8YnyuSQIIebzsLi0TzXuMlE9Q +-> ssh-ed25519 aY2AXA XDCdtYElwPVFPwlgn9zD2dxuY8UsHaAvygWq2QyX4Bw +6TWFxgA2V9sLj0++8WYMTMnyTjJnq0LhaArueiwl58w +-> ssh-ed25519 AQhf1g TWWyyl7ttp4eGHH35UyYSfwS2yuZH7UeHuhUnoUIs2U +TXh4kbyKo71jWYdbeEmS2nlMmOTSJUn03UF7Ol6oSkQ +-> ssh-ed25519 mOmPfg zqqKpLnTx9aKk72xdFehvhu7dFQp9O/LL1y+lNQ/g2Q +bR1OKTYqT5KZzF/TxoL/acBMTknx4XI/nxE5D+hv2A4 +-> ssh-ed25519 YJiRbw zMJpjQt0KEOTk9XXfR13uIlJxwECFWmNxzMt9mPTYXU +zf/mfE8WWunmxP+gb8jcO5M18PQK2hnSuI8b0eS+sgs +-> ssh-ed25519 Nl/5yA mgf28LLNHBxcKK8r6PSa5l+/FVy45S+rAL84KuINBy0 +JcNk+i/XHrZ9KDt84xx2JGykE2PLbvS/8KVjwlOodus +-> ssh-ed25519 GdLgCQ tAY8FVIeoK8DJ3qlhomdQyH2scJGXhPiRUooNiC2Bgk +wIVar/Cfbav8uEKN2idl4Cx6Fw5eZCWWWn6YCR5gkeU +-> ssh-ed25519 tOH/HQ FavaFypl7SLeKZZqKoS3IRFmf8NgSaZInUloKcN5/n8 +EdLshGwCKJw8x9fCg7c+y20xZGjyHohKE6J0ZMOj49Q +-> ssh-ed25519 FpzvfQ MDoOk8xs36Zas5jtQysGrZv/bfPUuRUYfngtxQvXqAs +uImvVDbEAcMP7A+h0+ID5kppOJEn51fOn6gWwuzka7A +-> ssh-ed25519 2UotMw TlwmJRa0L8zNMwkp9ILiDqx7Xd5VqOHMcDMEEsEDRgc +kALqI6v8UaO0FtzRuCaqEzH7qDE14Ybteuyu3fvjqrA +-> ssh-ed25519 kdPvzQ quMLrh8bRlU3VvOrniUxtR7yIz7G/pMmawMcnBaQvEA +pq72meBeFrFEE/10mHabL2ER5ZBujES4yhixwNVyqHo +-> ssh-ed25519 onmXpg DeyXaFIeuNupcKmIung7oFZnbFGJf+ypGj+m1OG+DVs +8Ge6KVAcpnsXoBoQuDFkALoztAYheyGyj+23pFscLvM +-> ssh-ed25519 CnhD0g pkvn2cgBxSIfav1yaXQ/LTxUFfMaAMG5H0gHJlUVSRA +CLXecUCNZRG9kzyaYIkLR/AiBbHaHx0/3Ki48Zdcq6c +-> ssh-ed25519 4ep2UA KPdsQFYh1iYkWWOOr5wkwIydx0WrwMI/ka+Jl3DnqGg +sw8E8XaC0V1haKgDg2RfGgNcTszZtd0rvSjvsujlhVQ +--- ni817qnW1XIVM9VA5OXWizGyV/MeDV1qAPLLzyXeTjY +՗Yc MX˼^)Y6rn9-nGqߋѤVgc{<'0@0zlcƺcSs%/VcbpqE*: \ No newline at end of file