From d36e9ba0f9547964818e6b874cd5775eefcfb23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sat, 10 Feb 2024 23:36:06 +0100 Subject: [PATCH] treewide: more github runners + naive concurrency --- hosts/kazuki/default.nix | 7 +++++ hosts/kogata/default.nix | 4 +++ hosts/legion/default.nix | 7 +++++ hosts/ude/default.nix | 5 ++- modules/system/common/github-runner.nix | 39 ++++++++++++++++-------- secrets/alert-nrab-lol-pass.age | 12 ++++---- secrets/alert-plain-pass.age | 12 ++++---- secrets/attic-creds.age | 14 ++++----- secrets/github-token.age | 14 +++++---- secrets/hercules-cache.age | Bin 979 -> 979 bytes secrets/hercules-secrets.age | Bin 923 -> 923 bytes secrets/hercules-token.age | Bin 888 -> 888 bytes secrets/leet-nrab-lol-pass.age | Bin 384 -> 384 bytes secrets/legion-niko-pass.age | 12 ++++---- secrets/nrab-lol-cf.age | 12 ++++---- secrets/secrets.nix | 1 + secrets/storage-box-creds.age | 12 ++++---- secrets/vault-cert-env.age | 13 ++++---- 18 files changed, 101 insertions(+), 63 deletions(-) diff --git a/hosts/kazuki/default.nix b/hosts/kazuki/default.nix index 80f1423..8f2557b 100644 --- a/hosts/kazuki/default.nix +++ b/hosts/kazuki/default.nix @@ -27,5 +27,12 @@ }; common.hercules.enable = true; + common.github-runner = { + enable = true; + runners.settei = { + url = "https://github.com/nrabulinski/settei"; + instances = 2; + }; + }; }; } diff --git a/hosts/kogata/default.nix b/hosts/kogata/default.nix index da463f8..e5dc94a 100644 --- a/hosts/kogata/default.nix +++ b/hosts/kogata/default.nix @@ -14,5 +14,9 @@ environment.systemPackages = with pkgs; [teams]; common.hercules.enable = true; + common.github-runner = { + enable = true; + runners.settei.url = "https://github.com/nrabulinski/settei"; + }; }; } diff --git a/hosts/legion/default.nix b/hosts/legion/default.nix index 603b48b..7f71d1b 100644 --- a/hosts/legion/default.nix +++ b/hosts/legion/default.nix @@ -38,5 +38,12 @@ users.users.${username}.hashedPasswordFile = config.age.secrets.niko-pass.path; common.hercules.enable = true; + common.github-runner = { + enable = true; + runners.settei = { + url = "https://github.com/nrabulinski/settei"; + instances = 4; + }; + }; }; } diff --git a/hosts/ude/default.nix b/hosts/ude/default.nix index 1913f08..a6be5ef 100644 --- a/hosts/ude/default.nix +++ b/hosts/ude/default.nix @@ -22,7 +22,10 @@ services.hercules-ci-agent.settings.concurrentTasks = 6; common.github-runner = { enable = true; - runners.settei.url = "https://github.com/nrabulinski/settei"; + runners.settei = { + url = "https://github.com/nrabulinski/settei"; + instances = 6; + }; }; services.nginx = { diff --git a/modules/system/common/github-runner.nix b/modules/system/common/github-runner.nix index 12163b9..dd65051 100644 --- a/modules/system/common/github-runner.nix +++ b/modules/system/common/github-runner.nix @@ -17,19 +17,28 @@ }; linuxConfig = lib.optionalAttrs isLinux { - services.github-runners = - lib.mapAttrs (name: cfg: { - enable = true; - tokenFile = config.age.secrets.github-token.path; - inherit (cfg) name url; - ephemeral = true; - user = github-runner-user; - serviceOverrides = { - DynamicUser = false; - }; - extraLabels = ["nix"]; - }) - cfg.runners; + services.github-runners = lib.pipe cfg.runners [ + (lib.mapAttrsToList ( + name: cfg: + lib.genList (i: + lib.nameValuePair + "${name}-${toString i}" + { + enable = true; + tokenFile = config.age.secrets.github-token.path; + inherit (cfg) url; + name = "${cfg.name}-${toString i}"; + user = github-runner-user; + serviceOverrides = { + DynamicUser = false; + }; + extraLabels = ["nix"]; + }) + cfg.instances + )) + lib.flatten + lib.listToAttrs + ]; users = { users.${github-runner-user} = { @@ -59,6 +68,10 @@ in { url = mkOption { type = types.str; }; + instances = mkOption { + type = types.int; + default = 1; + }; }; })); }; diff --git a/secrets/alert-nrab-lol-pass.age b/secrets/alert-nrab-lol-pass.age index 321ccf7..371a235 100644 --- a/secrets/alert-nrab-lol-pass.age +++ b/secrets/alert-nrab-lol-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw mwmdWJGJ/XJNFdlu3rfdwPZwArc4k0jCyg0IOt7Woms -mR9gZHcrQpfIBahm1F4Mi8peBjMqRtcqvKiNat15mE0 --> ssh-ed25519 GKhvwg 56FsOXlgqk60VEJCbw6MxVm7rdNLTHhZLec+B3uiXyI -Tr5+EuPuCOUEH3+snhq/Pt7RRzT0N5GTi8+kBL5W+JE ---- GsG8dZ4Pm4fmdeTAB3FK9hpeuoLK3vBDgNZtGCWULj8 -M囧-f57Il滁梯 蠛鋤熿Bs潶躺蹑| u埪蘇qy_c嵦P炼zy2e0阞湢4轰S鹌2雊b^=u黌d袕) \ No newline at end of file +-> ssh-ed25519 84j9mw tfUR84yYxwWvNBmxvhsZHGtaIruTij97ZI50cJSL/Qg +O4l3r8XdWzLZuxp5BolTS7XOfbDvwj1Ybbl1TPSrtSY +-> ssh-ed25519 GKhvwg DItnbkoSp8LfS6MZsKZ8njOnbtiqYufdEHr+dbb8i0M +NYOrpEIWujBGLdBWyHJmtTTdvlhVlpDaI1r3RM8K9zg +--- Lyzm1dKlnSIdBYB2tQuDEbGy9Gf/KlHfOAPw3NT15Xs +夛69匑#JQ绥#;)? 8/0绻8龈脐Z 鹻麽尪S熹癧種弡憆Jb挬縎~櫨zk極'4 \ No newline at end of file diff --git a/secrets/alert-plain-pass.age b/secrets/alert-plain-pass.age index 6810937..8ebd447 100644 --- a/secrets/alert-plain-pass.age +++ b/secrets/alert-plain-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 ioPMHA 4EqxwfHCz9VJQPMfULLbAr9eaesivV9BE1ERyrH91xY -M2l3meRzStyjlG9enK3ObCeglXP6cOfiYzrqcw0in2U --> ssh-ed25519 GKhvwg 2CjaggQgGYNEfP/IBME/T0cueM5KY94nK5VbbXw4Tj8 -Mi0Sig6qtnBtKVEiw7uBQqyLdqxw6OuJzAbu7USrR40 ---- OfhXRbqvSTxx9Sv/Ke7IHMSZrkVF/dmCqabmt5fbhP8 -際r瀖-iB侈.趝2籡P跃d!e籁 Um1鴞d屓 \ No newline at end of file +-> ssh-ed25519 ioPMHA ataMxkoppMnkRaCScXAtEohUU3WE8fEYxBeaZYOQoXE +WcBLxLGjV1uawwi5C70+XMEo7Z+UfWspPbWW+mQDqhc +-> ssh-ed25519 GKhvwg 01u8Pl4uXUryHlKVkgywl0glUBEtVjdNxXCPexoqvFE +mVlJz6NKCto+Re1Ps64+yg1Ztf6sWWPX91TKyerIXa0 +--- b/8Zb9zbaU7zLm0OXMsWrIx0Iahq/oKkxcQLhkDsutA +"Ζ>k榣R塍泒="-u:晢8":鞠(D眸釽儐到䲣猵 \ No newline at end of file diff --git a/secrets/attic-creds.age b/secrets/attic-creds.age index 49aa31d..393a98b 100644 --- a/secrets/attic-creds.age +++ b/secrets/attic-creds.age @@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw L1Lee3U0LWtn6zx0M5pA+VpiRtx903AYyVPmeaciumA -dfEtGwEhEtBGnltkRFT2KMUl/tC1b8bYCLKtut0S75g --> ssh-ed25519 GKhvwg Ybp7LvImp228BXqj9IfahYkdCZdO5NgPGol+GacnfQM -hSU9nhgpeOgRDQHDpO9mFPdu52R6y2/lfYCI01/3ypA ---- YnhUF2kfu+Va5YyMjZcySvd4dSbvz5CMIAkbX+2iUQ4 -'凛Q ~ 什"#厏,齌6!橤~字7S魙昕駱-笶 +蘚 -)稑,2巉.牸|M9 z俿' 濲"'6_篬.rq輳8ぽ|y>鎉c"簞w虷 裒蠜E殆顒蝐畣Ni慾銢育炞䲢7 0 嫃駫 \ No newline at end of file +-> ssh-ed25519 84j9mw v0YsgTbyCuVI0uAXTeCR6XSORbwJxVpegx+adh15aw8 +HvNFhJmh8MEybRtG92IlsQZXYeDyvh0vsiu0f08CXy0 +-> ssh-ed25519 GKhvwg MrFFxPlJ7JBvUhl2QByLvRIigGmBT2J/123O90srXx0 +f8dGUqoJbQjH1epgvTte161wRn/sas6AayOvqgEcfc0 +--- s1v3ZB9lVmLob/xQ48C/xa3DnXZhoJr0zVk/X5VfdJU +袪苇+碾O爜PU夂u螔M搷嵈阚x爷鎂G')此次nS.>4賮婶盷怸:pPT4UB騹?J<&dZ汼棌"2_(义 +I肘玀汒?幆B抽I塚P:湑俭%O価r綶&0紸埄?[J ssh-ed25519 IFuY+w UcPjVl8nIr6sgfsxOrYmgi46rAsfdCRy9iTGkQAOaSE -vKislIP2yoQahKTpAE0d8P3ZdyyCHThy4u6vshtOQAI --> ssh-ed25519 GKhvwg 2ZS+VXjZFBj3n9RoJD8Ynn6Rur6Abs5loOtebFIang0 -/47vHgkd8KPnM1sPWjqFDSdTk3LiUQNmO9X0HodHjS8 ---- MBuCzebM317ShOJsMaGMdUR83avwx/Ig84l1q2Fv6Ng -五0撆藔〤;╠-廂覕1 "%?怶栎辀甉%帳k鄿WU3}簜-祔M,@嘷♀\ QUPmJ \ No newline at end of file +-> ssh-ed25519 IFuY+w O/FQauaFhUwbinIrTM7/cRbolpvUWXNKJBxrMoUVJF0 +GKPP4rmiC2YQs/ythlp+UwPEchVg5PMQ4zr1Kapukmw +-> ssh-ed25519 84j9mw 4R3KhL7n/7/bLOwipVLST25sjANznNtdPCOUDS8Ztmg +JjrQ/BWgrBly4SyEskM0I4Q1tnyVytOA6TmwFAKilr8 +-> ssh-ed25519 GKhvwg Fi1Ji7ohIublP7bzYWhHZeWVg6dB9SJClTZx9iGIxk4 +FH8JIjI+oPJTcQARh50PhegayJw6Bm71QglpB40Y5VE +--- Vzb2XFEK08ENArloqCy6gAU4laVkKo+0kKAJ8d/uzgo + I蕍VX碠+,n豱3\{'S9葡/蔚>I;q\港瑞鑷d慦9T坣餷 *=桢哛)1C绌鑸R \ No newline at end of file diff --git a/secrets/hercules-cache.age b/secrets/hercules-cache.age index 034c1c1904b6cacfbcaa77534fd68cfeaca985f2..1acf80e09522ca5cb58f4279e9b5dac2b2069dcb 100644 GIT binary patch delta 890 zcmcc2ewlrOPJM`5aGGU>N1%C1xV}e7WR{zYVN!rmUS4r=QbvwNU`n`qa9)mOnzmJ}KtDCWfV^!4+nv5&6lJ;~6Ew{F0OWUDHZ4 z6O*-5!<{3G9m~7|y-SKKE6OT7EpkmQT`jX*tDFMdGmE(j%Zz*r(@Vn=tMm;c^Yb%O zN*&9pd_yf$3Y?3AoU%&XaxH@0!gGCn{9PxXWfZSB_VbS@%rObb)h;eIv~Vt~aEtOW z@JS4?3`_NJvd9efH4L(F$}NjbH8$W%P0uOHu1a$$FUT}1iY(1cOVO{WFpTmx^mI)t zHH-*$DKd&IuSm=`FL&kA)zwvqGzzkebS-d=2r&vOi!uq$Hz_a9_4RhmbxBM$471eE zEYGfY56#X?PY<==Dt-_!UHjgG2mAM3f8^KeKQngz0Y&-5PxF2-B#Nzl;w{;foAYMA z$Mt`47q@$Mv}G378r^^9t1PbX@M($f0dL*u9x_rBGR$_|%$Hbq)Y9{iq<8S^13jg- zyZ%j5ug`IKo_RoB{l05P@TuHQ>q@jlxc8jArO5N!yuOCd_1}N1Wz!~ z{_edf@5%KSU!9GZ9$YK&=GU$uWrdzRrhATGY=2p@RrazUJQg5cn0mTBR^Xy)^{TI7 zH@1D8^UlNfvg&l>B8lbUtqm>nuLk;E{(b7*zKUCHUPl)GWjx38uI<37irT&%>JEjA z-Y((R(AK=$zwDX7;zQOajOpRGCbdkb>Lt*#U?VEKkF#A&5E6oRyPXVi9WYz!x delta 890 zcmcc2ewlrOPJLu>VsL1cV{uYpaI#aLMP5dMqhXLwQlzI(QdntFcyXX>lw+2DMSw+l zK9_!qetLmRS!S|Xj-h_GYr2QGQ(n2Nd#P!9l#_d?flsDcd67%HiF0UVGMBEMLUD11 zZfc5=si~o*LS}w|uZN>TSa^AIX1P~bN@!kDn7enPnVV;-aY1fkdRTaYsbip*wsvuP zsEMC(vUz$smws86zDbgqPoit8Q(|6fnrpFPT8g$uP@zGhQDkOnU`3v5YOY z#E;_P`Qbr+;gNYk7Qx2;W=>Is>88GcmQLB8mgW|d;~6Ew%0u)k`~q^) zj7)OON-~rE!-~W6&2zFW%2SJ+i_4rs%ndTl^P;jng7djdg3QW1$_?D|b6pKRT+2fY zJqrBNBR%{LeDqVD&Adwe!V=9YDnk=PiUTK~WfZT^@UV2MGWW44j|lV5@pMZoa!PSB z$xHJ~@d+|D4-Uz5*H85`aSbtc%Jk(5C<*c}HZIFd^3=|Vj7SZr%FZ$kaS!$ivq&nk zEJ^YY2`o2GH>gM{HgM(A)zwu<)DQPBsqi)}Gm9v3D@%0rbt;Ssj7rO>Do8HUkJ8W2 zOV6q|bc#$fOEPlgdYq-QLd@vSwOrCGu8=jam%ddMO}~;o zX@SF@jRC)^-B({@aG5I0_2bZvv)u3B3MFJcecU@E>~*~F9a*0vk1DS(KHhaffJM3G z?up0F1_#`n{WKm*PFHv;zHi>bmHu~xrY_mv;V0sey}Uk0jM46mMBs~;CP{AHK0>>; zhW!yg6_mN}v=(Fcw|5-D^F6Qr$zQE2B-14N_mriRzVbfJWR^^`c3&48#@qidWayn` zZR6t1c=pc2W$gN zb%hxZCi~ph-TNoX>|S=q554?H>n|Im1XuTN{2x1M^{Y>7Ikyzg{$$UmYZ!P@@xp`P ikFLr~Pi7=b&iwH+_oUc~@+O~z&R5GyOV;^Gp9KIbTVdz` diff --git a/secrets/hercules-secrets.age b/secrets/hercules-secrets.age index eef4c8f5b1994383755169d6bbc3516ccf8c6150..67f3294a163b86db4877026227300383a123b984 100644 GIT binary patch delta 835 zcmbQuKAU}lPQAZZW|?JDiixj9c$9lYPG*3qbD)K3MutUNd9k5WfPZMZdy$!`c726;~B-nU9$5^0y4`B z!@WaOOq@akgN*#LBAnfl0;-DB^mDTdD6X z@ec?N3(I%3$Sq58HS=+@EYZ%lG_Q>0a*yydFD}wfOifG9j|d4*au3YQ@yYT{_bko` ziwuY?F)<7X@i+CTatk)$($&>f@CYl&bPD&k$T!I=&&UiePATyYsR|Ev$;m0y&h-rR zNz-E`k?Ptc{;{9+VH}k>M;APw%h0fNTqUj}tXXpLCwKdG)xx~5U z(evBB-*$h(5%}$7n^L&+!C&8-ZZYdfHgS4L{BHa6s_3iedb@zdtUZ0N>q3@Xw|Q`0 z_Ke`8Px^9srxvj)TTNenp26_c?SoevJ!~TT{C>K;*7YjB!?kYz>z&N!ZmjZa>AlP5 butsIK<%}IhtOaxJdww);&0xG`H>Vc>`Q1T^ delta 835 zcmbQuKAU}lPQ7ttRhe&8NpWFnMNoD~l|^}wmt}>ywoy`fRfVaCk4bWFgu7#6ilJXd zI+v4vRho8MR(Ya+eqecehLL_zsgYk^P_~nIu&cXva#)~efT4GkL84n?IhU@TLUD11 zZfc5=si~o*LS}w|uZN>TaYm}Ec9ch`QAT-cu~CV+hg*(?Z%V3{hhd3%v00{JM5ViF zaFLmrkEc^0S8kfAg`bm8ZcesgMZRfewrO~JkZZ87b4XaRcU5+HMVV7dP-UivSCU`; z#E;_P*~O(s6=peRPT5Ir2IYQv-hP%Qfj(|!W^NYYE{2AsiH7;%-X=cbL9P~DAwixQ z29_2XDQ?=izENJO6-8b}c>#q*iC*SmfnmmO<<80eq2Uz)`Jw5P;~B-n-5hhG41Bf2 z%mNBZeJz~4T}(aoO+vggEsK3~^&KOxPtHPZVJxZO8(#=vTLjsd0pJf!Uj|j@ncBx2rDb+5wNDNBLNpf+_ z^9heAw+IU?&k1z#4D)f(PW5uMsB$Xi3dzsXHus9m_bjW*EelT$2=f@GJ~XF-kPecQJFa@Nh{s2v0OCt+FsPF|hRa2nuz# z@F{VrFV)U>H7GUr!%Fh~?ZA(?~oms&&`&Ly8^KZQnO0 z;k@$CdH(di2spV}*E?Kj@&D}nPx~HD^D^Q$JT7Mb?cBui^UqU_jg_7pJUp+==`;RI`ze3yDg8r-nO@0!gceF>4H&y zt2%W(Z!eYY`}JHlP5rgrKDqUupWNN?;M)Atc^i*DYF>Fem1W+GO{q?9F23D0bK4f2 zonqmzjO~Z0h*qV_8Ridjf`1seC8TJ-&s*_k&aHxdx{toQp1i-KYqx>o@@4~%4L%q7 zG++FFZo1u~yvi&5t<~ZuF7v%sc?$gAmaKhkw?g;dmgbk*&n*`RIXZ9nBINV!vqSxT94 zC|8-OpHGCVOJHekZgEh4fOAp0WngZmV`gfIdzG2DOTMq0i&J2cPk3%XK9{bYLUD11 zZfc5=si~o*LS}w|uZN?8M^TccV{vd+Xkb)ixtCu`nVY$3v7<+Ydv3m`zf+2FKxuJ$ zsfVv+kx^zcS7vrWUZjh0PMTR_PGW^uSy^(BMQA~=L6%R6w|RMHVV+^8b8=~FL~>>J z#E;_P?#WIOxz3*M{)TB8Avtb|p$0*@5q`$Wd4~S(;kiboCE>oAIT79=?k`=EXYl)EHZcH($&>fNb(3Zhzt)e^mH+EO!qe}i41g24@s`jH*-tLPp>Gi z@T@4W&-O}BHS`LJd% z!?sr0Eo-(vy(xVv=kc*3S9_%eeAk3HE?cfSP;E0IsAXaO@=qr16}A(cpP7dLNL%%# z+Gj%6B)4yse?pt(3!bnYUnv^bd*%P9r<@_hY@cTzlXzCusSviwYsu@2raHauOMWse zVl=(6Z9+p#Fmu>vy&YMKXBLLt7GwD}@5C|nEnm;4%E~=k!uPAZ!k>Mzl_HC0?v_6@ s*%%@&sC;B`-STCv&MookuiNa*UtDQkuk~j`q@Yr6EXS#T=Bpn704IApBLDyZ delta 800 zcmeyt_JeJLPJMcwYeAHyk+*?Geu1NtNl=QmTWCg(hq-p1MW&;VLB2^N374*&LUD11 zZfc5=si~o*LS}w|uZN>TQbs_DYni@hNNIsngjtTiwp&<=S&2)bfwqrnd9Hr3zJa4} zab#F|UZtA>SEWgmPpD_GL1e01UTLnYvrCpiaA{VQSzc0vQ({D-g=0~Wi+@^1VMc|? z#E;_PS!QOXewpd!<`o4|X};;sL4}EV$;MS-$;NrX{?1`e*=5;j7Fmv2+JOdKN$&cg zl|I3)g?VBAg{A3}NOLCp^ z5=%=HlSAB7k_v(xME3dHh zE!VEH3@dYuO0V+DPS5q_($&>fNOEy@iAc;ejSQ$L@z6FlcCQL^G)W8(%nYz}@=33V zs&KEU4-fRW40m%c=4#45_y4tX)64zOTllP&YI8j9X6W0MBEI+e_eJ{q-C{(-9v7IH zbI8Q@^T<@BXQ`?zHQTn=vgh}lMkggd_v&a19?hrT9dg&VRw-94EVH=9AZnZTF51Qa zo=Z^i<7n;alD9tIm{mU6v}A%$n#l!)*$E3*9N3b}S|8H2voK$L+g!u;(|PNEd%lsa zW6OM^);O^+YI04!v*fhZUCy0uCBlA>P0t=wu}hb9b6Ao&dA{rPROvGs;pQUekLg%e zELOUGQ}$CH&+c<=q0cSmyl1%_``o0WKyXRjrN&hoSIlI5!7%Oa^^hs6%f5wF9_p}^ pQF8Md~Oc$Pp!MH6L-%JnbfwUyMIkh?o(wU_N6oS0|4j;E8YMA diff --git a/secrets/leet-nrab-lol-pass.age b/secrets/leet-nrab-lol-pass.age index 147eaccf4a1804c252519108c76487cdafe7386b..1d5f70976d49d0b078b5f5c1e253707942728fd6 100644 GIT binary patch delta 349 zcmZo*ZeX6EQ(qL~ZdUH?6zXQ+X{Mi45}p=ZYHs2jobFg&kYbpb?B^Y8WTq3xTQTkc_8=~0}Uo0;qA6H*+M?V0A|W9(y4?iTKzl4I_dSXdFt zrK_u}km6b%mYCyanU-c=8XE3V?i~;qq@P>mqg`(4Z(N>il$D!P73%G79OYQf=BUX8{umd9+>Hr z&lO-)mQ?8+Y~-3BmFePJ6zuC36`XIJpOae@>RndoTjgx#nN;XzoR^j9%B5?kP+Xj$ zo0?)|YHDby;O?DKR-Uflm|u}sRP5!L?G|O66%mmWSRd+~+ZmF_`roE@aR0}1Qu@Xf){URyafPukA#f? diff --git a/secrets/legion-niko-pass.age b/secrets/legion-niko-pass.age index 15ead82..52fb6ef 100644 --- a/secrets/legion-niko-pass.age +++ b/secrets/legion-niko-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 ioPMHA BCoFRArzhiWzaXVtF1qkiPxL+M5WuLsrUqH9T8hh7D0 -3be6hdQ8hjRLCuN91pB8X/WhvwfpvPifsICFOxAUxlY --> ssh-ed25519 GKhvwg 0L+oViZLW+pKKDmP2H4uv1PDAE423vqAHpPltN+euhU -zDVev9k/LRuqUWvSjFxCE0H+yt8xniV/Au0Z+49zY9M ---- 1UkToOyXP7ljQ+KTcSfNydUd8J1rm3QeyabusJiZqAM -J)2鯽 ^6歹掍棈顰J嵬5忽1i 佉摀c牓骱Z殐P ssh-ed25519 ioPMHA kdyCpSDZA4wsaPClpGwicXN3bLytnBT2RmRD14tjdDs +vRNd1HuCBYTD2Co9G+Edb3T5ecTLzjTBWWn/J26y8gA +-> ssh-ed25519 GKhvwg 5MZxra/oc5lMPmx7Y2mPJ0axSQrZm+Vc9ep8vWu3Mm4 +vGC56lhi+uwLBx4Khne+YoHkNi6pH6srRFDyNKqr/8s +--- NfSPAUies7aRBOwFmVUbcBzkPxfTnonEqP/Iot6Mc/M +{綹i鷏4m*(稞嬄O缸寚顗r昝簄<廽47薶[Kd,#殖.鎊s饺b鄻j膚竅L鯭甚''O鑎'6Ν傄c?~DMZ骽'q玍 \ No newline at end of file diff --git a/secrets/nrab-lol-cf.age b/secrets/nrab-lol-cf.age index bfa6272..32e5c77 100644 --- a/secrets/nrab-lol-cf.age +++ b/secrets/nrab-lol-cf.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw QEsw7uvxEdZ/2Bab/bGd9/Ap5psN7p5RudFZJFZQ3kM -UZCthc92ptbwxxe8nFnhvdedkpt6Y/nJf8GI0qdQRcc --> ssh-ed25519 GKhvwg BIAW4Jad+tcsVXR6ibhWvvuvXCNQ1seZR1HGym11Mz8 -9NHhqlljWYoH8t1s4vvgzUjfL5lxVPVEY/pDiDP9h1I ---- dyefPpAwwsQ4xLsUBr3L5VYBhhdVKOYaCrabI042cCk -_凌庴ofV炁!藔v^>'榒氹qW'CшE貃j篷7俖)|t6{粆裵宣溍一#幇烥楏汼费钬砩>Q希"C \ No newline at end of file +-> ssh-ed25519 84j9mw Ao9xAby1hDTHybu6IkkpSYj2+fIrp7RyPtD4UhDcllU +JagJ33GdoNif6fv4x679IkFUVKIB5s+q8p/86pYWG/k +-> ssh-ed25519 GKhvwg wWBJKWZBeHz19y6/YHooVoeNtyS45+ff3zwZ+uTLTBo +NjgD+eZzt6lYZlN+TgpYQxTJ+JhjHY56vktCoLpvGLE +--- ebDqhUoYKbGEfLWElIgwD8nPei/6dWKTRyLuT3AgG0w +昈莑k齨橐螸袟v嵣醝%(垅326d倔WN$i)闵zz^c设 :@墭l|Vkd赔科[X_)黨?糨UaC} \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2a5dd38..6164cf5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -57,6 +57,7 @@ in { ]; "github-token.age".publicKeys = [ keys.system.ude + keys.system.kazuki keys.other.bootstrap ]; } diff --git a/secrets/storage-box-creds.age b/secrets/storage-box-creds.age index 20a50c1..941510f 100644 --- a/secrets/storage-box-creds.age +++ b/secrets/storage-box-creds.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw Ne+o6QDh4zL7sYize81+CsErRJqFPVPvqgKof1NaGXE -cxgH4T1TL1QNebEpJjbhtNzsruScnfiJmooyu1H1hqA --> ssh-ed25519 GKhvwg D7vjyGI59njgGefZ0siA84egRuXDBJKHMykAfejvbiE -F6g9/HZYUGvH8fwXvn0jUbBpouloFbyD6cSYyj6efcY ---- 6wPtAFTNJYMqW26PpAHohjNjryx/XL7UIo7+91CFjZY -諳贩>鄀N陯2徦梋4籰#髆o 挍傰 `%0X X)C:骩鑋崘 婛鲜佃+淙*t鑝 \ No newline at end of file +-> ssh-ed25519 84j9mw flAGDRU7ONCpOxgQvudxjl2H8U4LB3ATxOF6/Q04QnA +KTudGd6ePDARxgM3pxNbcFvmHKOsrr1+5pMhoBOOn8c +-> ssh-ed25519 GKhvwg xyDU0Bfmt/ib35pF8PcZAi4mBwbsMlyacUqNnBlAyG0 +fjyIGDjOaLgb1qzejoxDEUZiMGuXwRKc1p9Az0qy20I +--- rLpJ72c+QSvu+8LMOJp1XRrtlNmH6xU8ObnvilPzl4I +0=v2銾绡弊R襲逓弫 yジ.,&舒鋼唼文9!俒A`$茐 莅q謠顳]萕!覤k \ No newline at end of file diff --git a/secrets/vault-cert-env.age b/secrets/vault-cert-env.age index 6dbadfd..7ff0cc2 100644 --- a/secrets/vault-cert-env.age +++ b/secrets/vault-cert-env.age @@ -1,7 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 84j9mw eje98xFWmQ76FVbbuu1fIJSN26sxalB3hQeCZe86tGw -2hIPVSC1oLwY/AtEhKa0qUenw8nBBOY5uC74B0O4ohs --> ssh-ed25519 GKhvwg e4D3PZQrTW3DHV9YLD9d9wvirIhCNJCBVqI/BKC6CWA -jpQnjh4yhLJdjeBcjlyP+aRZfSI++7j8PxlIwbQ00Qw ---- eU8hHBZ0+PiVjH1SetgWVronyegyAZclWnIdxHmeO8Q -)b#pBJx謴纪%稐嶚阛q(lPǐ{+j伎>l# \ No newline at end of file +-> ssh-ed25519 84j9mw hvZRPX7KPlenU4WVrYxW9LrmjGuJyUv3L8Vf07QvIDA +1r+hIxsH22OlbqmPnhBO+8IYAgF+MyzYIslzfyKYkHQ +-> ssh-ed25519 GKhvwg WvQ3d2G+R3vLmBmz5P7zEP/0/xNgmg09sMEzbVGy11c +joIgz1+t5czRm3Mz7H+aggPJCU3EsfLunRc3T0CTZOM +--- 8Vd7XSFbf48XVttovVQcS4eVwn3tf6eTEUN5HHn+r14 +-涖P敞p>9RS:d砈7艶蝊D-&晾袓Yz5d涒管0鉷d$麂i骵: +殱鼟u:.2N]#W*s茗)苳cy 鸜t. \ No newline at end of file