From 337accaeeb0dea85808309ddfd4e73768ed54866 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 6 Dec 2025 23:17:00 -0600 Subject: [PATCH] Enable buildbot-nix --- flake.lock | 103 ++++++++++++++++++++++++-- flake.nix | 4 + hosts/jeremiah/default.nix | 42 ++++++++++- modules/hm/gui/bookmarks.nix | 4 + secrets/gitea/buildbotWorkersFile.age | Bin 0 -> 2418 bytes secrets/gitea/oauthSecret.age | 39 ++++++++++ secrets/gitea/oauthToken.age | 39 ++++++++++ secrets/gitea/webhookSecret.age | 39 ++++++++++ secrets/gitea/workerPassword.age | 39 ++++++++++ secrets/secrets.nix | 6 ++ 10 files changed, 305 insertions(+), 10 deletions(-) create mode 100644 secrets/gitea/buildbotWorkersFile.age create mode 100644 secrets/gitea/oauthSecret.age create mode 100644 secrets/gitea/oauthToken.age create mode 100644 secrets/gitea/webhookSecret.age create mode 100644 secrets/gitea/workerPassword.age diff --git a/flake.lock b/flake.lock index 7f505b2..3196448 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,29 @@ "type": "github" } }, + "buildbot": { + "inputs": { + "flake-parts": "flake-parts", + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": [ + "nixunstable" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763946641, + "narHash": "sha256-kPP7k2b+Dkd91yJO01y3l1F0t+Mqvv8+FrPfjcCwszg=", + "owner": "nix-community", + "repo": "buildbot-nix", + "rev": "cd32d1c420320383bfcc80c1b0b402b6a7eccc23", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "buildbot-nix", + "type": "github" + } + }, "charts": { "inputs": { "flake-utils": "flake-utils_2", @@ -184,6 +207,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "buildbot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -201,7 +245,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvimunstable", @@ -222,7 +266,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nurpkgs", @@ -357,6 +401,31 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": [ + "buildbot", + "flake-parts" + ], + "nixpkgs": [ + "buildbot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "hmunstable": { "inputs": { "nixpkgs": [ @@ -709,7 +778,7 @@ }, "nixvimunstable": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixunstable" ], @@ -733,7 +802,7 @@ }, "nurpkgs": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -782,7 +851,7 @@ "nixpkgs" ], "systems": "systems_5", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1738741221, @@ -824,9 +893,10 @@ "inputs": { "agenix": "agenix", "btc": "btc", + "buildbot": "buildbot", "charts": "charts", "darwin": "darwin_2", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "hmunstable": "hmunstable", "hooks": "hooks", "nix-hardware": "nix-hardware", @@ -960,6 +1030,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "buildbot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "charts", diff --git a/flake.nix b/flake.nix index 4bc5aad..fce28f8 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ btc = { url = "github:fort-nix/nix-bitcoin/release"; }; + buildbot = { + url = "github:nix-community/buildbot-nix"; + inputs.nixpkgs.follows = "nixunstable"; + }; charts = { url = "github:nix-community/nixhelm"; }; diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 9383bca..da4eac8 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -1,6 +1,7 @@ { - pkgs, + config, lib, + pkgs, top, ... }: @@ -12,16 +13,25 @@ in imports = [ ./hardware-configuration.nix top.proxmox.nixosModules.proxmox-ve + top.buildbot.nixosModules.buildbot-master + top.buildbot.nixosModules.buildbot-worker ]; + age.secrets = { + gitea-buildbotWorkersFile.file = ../../secrets/gitea/buildbotWorkersFile.age; + gitea-oauthToken.file = ../../secrets/gitea/oauthToken.age; + gitea-oauthSecret.file = ../../secrets/gitea/oauthSecret.age; + gitea-webhookSecret.file = ../../secrets/gitea/webhookSecret.age; + gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age; + }; + # Bootloader. boot = { initrd.kernelModules = [ "amdgpu" ]; - kernelParams = - [ - ]; + kernelParams = [ + ]; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; @@ -123,6 +133,30 @@ in age.secrets.runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age; services = { + buildbot-nix = { + master = { + enable = true; + admins = [ "greg" ]; + authBackend = "gitea"; + # Optional to build non-default branches at a time + # branches.releaseBranches.matchGlob = "release-*"; + domain = "${config.networking.hostName}.shire-zebra.ts.net:8010"; + gitea = { + enable = true; + instanceUrl = "https://src.thehellings.com"; + oauthId = "97bcda21-49df-4876-87ac-36ae07f340ec"; + oauthSecretFile = config.age.secrets.gitea-oauthSecret.path; + tokenFile = config.age.secrets.gitea-oauthToken.path; + #topic = "buildbot-greg"; + webhookSecretFile = config.age.secrets.gitea-webhookSecret.path; + }; + workersFile = config.age.secrets.gitea-buildbotWorkersFile.path; + }; + worker = { + enable = true; + workerPasswordFile = config.age.secrets.gitea-workerPassword.path; + }; + }; displayManager = { defaultSession = "xfce"; autoLogin = { diff --git a/modules/hm/gui/bookmarks.nix b/modules/hm/gui/bookmarks.nix index 4a54222..baf9a40 100644 --- a/modules/hm/gui/bookmarks.nix +++ b/modules/hm/gui/bookmarks.nix @@ -287,6 +287,10 @@ name = "Pinchflat"; url = "https://pinchflat.shire-zebra.ts.net/"; } + { + name = "Buildbot"; + url = "http://jeremiah.shire-zebra.ts.net:8010/"; + } ]; } { diff --git a/secrets/gitea/buildbotWorkersFile.age b/secrets/gitea/buildbotWorkersFile.age new file mode 100644 index 0000000000000000000000000000000000000000..4cb963e6382ee3072ddafa2f4a84e83a01a11958 GIT binary patch literal 2418 zcmZYA|L@!c83%ARV#tl@B#RCR%Mo=9%WQks>$OY??cKH4-t~IzwbyHd(_XLF_O9Qq z-+M-62tvfgA4o&eULJShrM3{;r6XyiKkVPV2esN+z3?$;`=i6WK%JV$$ z=XrF?+-LemRECKY_+JSk3(VlkzFVttZ0|E?wMGNRt0suAkRO)Pmsi1Wjzuq-G5|TmzEdFY}94K5MT86uV%$Kd7c-k1TsT**bnj&9s5GR z9Ar(HTp(iZGVKyu1d=MYfXku|#3(PSG1mu*@RJydCg^Wgd4DwQXaS8jRw7$LaKQ*$R>F zv^%T0Ew(Gt5U?Ukf2zS!Im0|+%*&gauGWYNQFSbq#0F5qM%J;NEoOAqU?>xSAYQBPC2cM zQJzOz0BlrJa6OMmBex@#?JRMtW!m^w47EZd1ZDvT0fft*=dqHmZfYc!>rJ8R`;9?M z1KL8w_WMLctUIHe01O1cVJMwhQ_Qb)TniSjkJMn`a=)FTRj z2tPm=yN8kLyeGGXO%0QMr6E*HO7d_38})e;FNQrhnNpdkv21E2E2ft!fgf}-$#Q|# zvf|cPEqUt4Ni>D{CJs#K6^@1Ve4IH{>A8G_%$2Rp^~>zCPC}p(_pE9+!7~pCOQ-J+ z{InMms5FO~T@|)+Lg|Dpr{>lL28_p}ykhBXod+3pf!pD1$w$j}2=l@5?5}`5~M{E@$T}t#siwK+attDcVtJpenr5tQdvziqelI zf7~g@*q9;^vnQ$?k|ADQFc-Fl+A5~F%mXo0|$o zL~gl~m2o6->arl5Lbuj}X2{D*3bkbrS3^gi_)h66TAubCrbsM=ksWhJX*vUWL4b&g zwW%e17wigEL&I$p8ISuuJqH^toz3h%C`YXc3^6MlHQT|ga6G%_!g2-2)*MBH=43vd z5J{}6z6=mB=0j38o8{KrYod-a+RmI-3jCA>0*71yJl|fDac@YvAir0~ZaK z9$0-<0Rd3q{3ZZ^i%!K3mbjR^ZF)eEC7Dgu(9CWMg{ ztwm7Aal;QKaJ=xGa3wb7A?eLR&&I-c~`QXUEhJL00|XjRh- zg+(!DYPxn&BOs(A+W5T2>w#;up%DWPg(#>+7TcOOlP=i>CN;c1syU!t3dH8zTE5+e zwtfKBipRq>7oz0WtwKvpPs!!PbMmI)VNHO_$z--5rMyAOl|GH7Jen3QfQb>p3`1D3*2A7nyZ?{Tsy=5fsWPCpi#se~3h#1LR-y7h7P?W;O-$Vz;Y z#77Befk2P*N_4gw&O?S~>+pI_EeTr%0vn*LN=5z0#T)<77{7n~vDS_U`d7UF)`>~> z$c|_KyyvQqpC$M2y71vo9^ds&Z|@H;yutkT(|27z-T&f&Uw%0;?=PPJ#Z~v7-SP9A z^)vLve*x`RpLz7HLpLn1-uB;1uWVbth(5RDuETHKWIhq!ex1IT^3EN4Z11@1DHlH@Cg|_3(E_@7|Zr&40h`2>j5E@3Id(dgIPdp7^(NK>X^_+s2*Qp)Xy1 z%i#+TAHCzXi+jxNPk*NP>)Df+zW0SQuPG;AIe+TtGhe&r@UQ4=e-vQXKG{3`W^%=q zx9oWTzMXgf^JhD`hfkfqsC_%SXZJndJahQEQ;!_{Xvab8Uh;#t?>@5qnhVITBi2*L zcD{4_ueaZn4PMVrT>1<4xBYMb=ZW&8|MBFHFFoX3uXC^eA6`E~djJ3c literal 0 HcmV?d00001 diff --git a/secrets/gitea/oauthSecret.age b/secrets/gitea/oauthSecret.age new file mode 100644 index 0000000..dda0169 --- /dev/null +++ b/secrets/gitea/oauthSecret.age @@ -0,0 +1,39 @@ +age-encryption.org/v1 +-> ssh-ed25519 64uajw wmYXQvPK2CLGj+oklP3/0/jsT7TaBX8g8y5u8bT/1Bw +5oXM/aewA4Loy6HEyjCcTwuGb5vBiNg5gyiS24f1Q34 +-> ssh-ed25519 oyEmTw ISskdl6n3pip9t1QL5UjwUkQ+RbDvcZFFXxi7u9bknU +4kpwHlccmk9icaRMJm9T6LzoOsPjAWAuYHugch75eVo +-> ssh-ed25519 mOmPfg 3RYPEtFSytstd4OLM2drPlKLT9nLa8iQJ9S8iEnRQ20 +VGH6WGpCQtnb++P/+lpRb/fx/3fUdfBkSCTkmSy3Ex0 +-> ssh-ed25519 YJiRbw B6LgjKgM6wEUQN6AZ7hdVmxRuk8N0D+b8Nq0OtadABM +xZxewylCS/fPg7y/f/BeS+KLwCgkAnc5pKUzp9zHlNc +-> ssh-ed25519 aY2AXA ARrIQ5l7uoUVRnfRefyDCAnwiUbNmiHKCDYMCK6Gpnw +vI6Ew3naEKzPGWd8mqVCjfQb3+Tc0bNzVNtosTTGVOs +-> ssh-ed25519 xNtnoA tu5PMZfUHoXA1EqgCGDL24vsIkHaK01F0VZT3uM9Tyw +H3vh5njkWGkGu4n0YKThzKClP/sxVgFJHUbLkQmXQyU +-> ssh-ed25519 AQhf1g FqWZ60ooUHuEKE2lPJEc9KzBObF4OI9COMglB0odzRI +wdmmSpIXceD5CzHxYSpjEsQM4M89GA+7es93/VrpX7E +-> ssh-ed25519 B8wa7Q 8vce38U3S8L6LOSdue6ltLhZ87iYrGHT439y0KxtmWE +sEHlodbwdRPzcjwq+znzxgEbqcwcrrufBVAz713Dp/M +-> ssh-ed25519 8UnW5Q jJ/cLMqnYf3dtTYey/+BNad9krAejK+E9MBmV48shkA +9MqHomFdN24DrJI3MAeGe0mtNbuwyjC6bvf3inr5MY0 +-> ssh-ed25519 0/WsKg yBiX6teISLAoeE2MSph/vVURu49NlOqGh8zO8NPlvA0 +G6+OXqD4m/VwuzcQTXoCEWfUUB25cLabAQG2IbXwpCk +-> ssh-ed25519 Nl/5yA N0FD/UaRLjPaj6LcUEvAO/S/VwsbsNbf0hx3t5uUGQs +YVE18niQZONfj6FCy1VEY21vzTVOaC1NWFwsPv2uSqs +-> ssh-ed25519 GdLgCQ VcAMW27Iico3egwYLLBgLBNJPlvKcW/zbQt5cgroQWk +1yuqGx7xJYOtkAc1ikY5efDGHyOSzKZ61SER3Q8N7Gs +-> ssh-ed25519 tOH/HQ kmAgORXCSysu8ZltQoTZIC34W2pcioF6T5o3A6WmA3w +nVQrQkkZqZ8YMnvhCFtsD8LPJG3STkOJkkyuO7EmHEE +-> ssh-ed25519 FpzvfQ fHYOxylQdotArmeOIwj7/UP/pIxOMJJ+5QA7YJ1CVG8 +/QldO5K8rfC/4Q+gwj768dktkkDJY9/QYUR5wqgbiJE +-> ssh-ed25519 kdPvzQ mi24VoT3IZP0fPn17hJdMhGuV0iFW+0Y1haSa/N360I +MgkEZCtYD4TQiCMdl7U9GTf9oDVMdKuK0Vd61RXiLvE +-> ssh-ed25519 onmXpg t3O2v+XnZb0ixz6KNcKZEakBVknX+2qRoP5KVyyd4EU +D07toCmMO4dL/ah7yLAzgvVTxZiK/efWS3hd4nWpg5Y +-> ssh-ed25519 CnhD0g Y++xWrnVkOOW2UTC5UlK2S5+tYCnYjT7hDtV5FNNil4 +5awQcANahV21nLevUh188tw9gR0Oac3gOuikY0rKDwU +-> ssh-ed25519 4ep2UA +aVgGjY2DXGwxL2zy0DvSndA2sMnj35AX3xeA+xYml0 +42/OMrtu+RbS3UQwdyZTSDTwvQeqwPrbljyiQdB5CEc +--- nE02yLCCqE5H9Irk1uAqZEU93pe8CSFDMSNW5tBWlao +C%qH\]W(GXN Vgqƕwї`u-Wk{](Rkwy \ No newline at end of file diff --git a/secrets/gitea/oauthToken.age b/secrets/gitea/oauthToken.age new file mode 100644 index 0000000..1a831a0 --- /dev/null +++ b/secrets/gitea/oauthToken.age @@ -0,0 +1,39 @@ +age-encryption.org/v1 +-> ssh-ed25519 64uajw G5tMy3XjIzZID9/frSN5TqCdtocK1ZxmG9NKlHDcSVY +ejACcsrYMi6UibwgJsIWsa3wHTV8yT1snVfpMWLoEnU +-> ssh-ed25519 oyEmTw wxKKNfe47RH002zB/i7er0gaYnWChHIBhVI6rcxuOEs +phRTRbyOGhsFN5MtysYGzz+2Alc2WYrT5pyHJNzTw0I +-> ssh-ed25519 mOmPfg Tl2g2Rclg1YIeMSEgP+7shphDI1Slpq1pTbLRBSBzDs +jyAJfKXjGSi3WO2RE7P6jibJT2pJ0a4QlO1P0rc0mWQ +-> ssh-ed25519 YJiRbw l/aMiLWUSarFj5Xg2NWmyKzmXypyugcFiPC8YIXIxB0 +Cd86fbW+FGUbZ8fmw4gAG6JQITE8vZZ2LUDaEkbf0hI +-> ssh-ed25519 aY2AXA 6JdD/csPwAuTilFKvGTAgR8pK/M+O3DULY0Djw/9Czo +gcENX80FUJzJoTgvs4mGvpIVT5JFW5CVfAmBa4Q/14M +-> ssh-ed25519 xNtnoA kKlfzWqmAQVdy3BPJ9Q/o+2SomJY1R/U39YGUZBHFS0 +4+q9e2bdH1jpGRSGchEFc1eM5r/iw5nLMpFXdCK/gVw +-> ssh-ed25519 AQhf1g K/5xlpOy4SLD0Yc+ACPT6Rb9j3UGzAaAXiNgJ5F3WEw +NlJ41ITQKVDR/Tl8Ht8oKWIxfVwhNFbW8BUMgF4cBMI +-> ssh-ed25519 B8wa7Q +NCO1jwgsnMWdyimjz4bOlLWPVgbIwR3gDCrVnpn6XA +mqInbU3cx7Zoo2ZRiBVcHlX85Cq+yGNA7nYaCX/507A +-> ssh-ed25519 8UnW5Q OFjDLICwR9YccZP0FoEGKi0V/kadxsBJR1+/P6D9QmY +EHSRBLRBO5TYiIaWSzFhnOIMIDrZm6XsuD/TsPeHx/8 +-> ssh-ed25519 0/WsKg j4s+a5ZvOGGEcT1NyaoLUeYUzBJqQkRXEiikL/kkiG4 +o9Py+63g0A47kCJ5yLUIkycUoCkhfgZC629xdfmJb30 +-> ssh-ed25519 Nl/5yA OywB9Njv01TvVfLQs3fpeALrA/JK+ddVqBV/tjRCTVM +oQgA0s/cGW9AAxbYY25J7ViE1uTdZhg7vO2gJBEhkaM +-> ssh-ed25519 GdLgCQ lfyX5pL7h5MC5i0D1PSkMldQf+UkpsvKjdmNCxhavx4 +TweR8vuRsl/DzJjrLwUOwdWfeIDKHhPru+Zf2HVj98E +-> ssh-ed25519 tOH/HQ R21uWbBHPzLAohnQkO5gQSj2l2OlTEcaVbIT1fElVHo +IIumoQump9+hKNdbxfhrVnBZ1aQV4siau3WIrmkQ9lI +-> ssh-ed25519 FpzvfQ ZAdltlbToqZjRJ8MsZj0Gz8RKDgVkb1qaND0Ihx/nTg +2aBZpB+nvd1RzWRC1nJX9awhrMeEl644zZTpAvdb3mo +-> ssh-ed25519 kdPvzQ ew2RiYY+ac88vIpVujvYBVkleuhjZTxPbk4NVbMNJw8 +KPRGp3I4EAf5+rn5Fy4NG85k83y7P+Wdn5yakjTVRA0 +-> ssh-ed25519 onmXpg 0aNUCTiiopG//4y7Jp0BzQPVMdKnaibG4vP8nmw5LR4 +v/XMw93xlY4y65N0f1eR9IetOwmNiQMUwbUJwR6i1ZA +-> ssh-ed25519 CnhD0g l5Wr4/j1a9q7v5/Y5vVEsFKuWHqnY2mvh5bHmf5KN10 +yUy+SsL4IsW0+92/2INHvJqt8WRcOqU3zW/HqJ/3Ino +-> ssh-ed25519 4ep2UA rq5X5HlG8/a/hsai5h0oUaCqejv6r0zBNI/c8f17jkA +5OSlFps5DOO74m7IIUvH0hRF8hFhz+8qnjsB8nBDC5w +--- s/58lvkmFsblrMC23VYDTn7RL65ymsFI2Er0p0/Kg5w +މDњ<7Efm؉}KT:r]i%" ssh-ed25519 64uajw rgHXx9Q5Q1Bgrdn4dCS0LxyeyeLauWC7P+B0TY7CfXo +qX173lMEQcEx2RvdPV7lIiKg3x9Hwll0PLVw30spQa4 +-> ssh-ed25519 oyEmTw 5REEiihg7uMdZx7q0QFdxnAn/zqZ+BL4G+EHGMezdWw +wRbRZuW+Mp8kJib4bVWKHJxu6g5eYZK8V+I3pGLVIcg +-> ssh-ed25519 mOmPfg ny4/yMRA4nCeKrcgWN2ubFnVHtkKqzqU0avoM3dX8kg +0/XV27J+xLHCuo1LPskjHZe++bKutmI4MypNH6fFjXo +-> ssh-ed25519 YJiRbw t9OiUuhAV1hGqvEYraI2XB+Q6Mvled7pikcHlFGl4T8 +w4xhcmYGuVTO/sxakmwsHlYzhTzryCjIjxnLil4iFwk +-> ssh-ed25519 aY2AXA 72J1cSsOYncEStu5eAIbTCBqNxYmrTOirxUi1ZDZ8To +inN/wZPyQblya4IR3SLml7Zipztwo2Cx3aFT81vwgm0 +-> ssh-ed25519 xNtnoA 6ZEVwntk5vciqivxaUjaz9C1zaB1MLX82dv7NfertXo +J0fOybfBAnPXem22A3KBHWlFC84YBVTDsIu1BYSfiBw +-> ssh-ed25519 AQhf1g FFobM7Ppv7KA6mnoZ0++jAZcW0oUeBzftbpUvomVFUY +SzIURs6v1NGU8IU4ji/DcjyhCFcmeGqHVkYXd/lQwo4 +-> ssh-ed25519 B8wa7Q GlhDsvAeUsgDofumECP7Wi2uIB21t3YWSXx40X+r+Uk +8xE++S41Q9ua0Z9JwV83hVTVllSgAR3hhn936JSQQmc +-> ssh-ed25519 8UnW5Q /rTQD1pi7VgT02SWlSaFvhU+u1BgSdQc7HWpDO17rmg +T5gjTlehX8YKel7vznIjye0oRcdIGQfcSuY6ITDCDaE +-> ssh-ed25519 0/WsKg LAjDsPstGI+t7CZ6YN4hL6HEFwXI3vGc6/dNPRJn2Fs +rG1oBH1z3akSd+gpd9Fask+1T8Uw+7+c8tKuuLAyKQA +-> ssh-ed25519 Nl/5yA l8Xzh3qVHaJE5axfGc1394hSIadTV8+U2+uPYz4POWg +aUu9bVrXMvE1C9imSdg5/JATDnVHkqr/4hVeeD+WVfI +-> ssh-ed25519 GdLgCQ 19e0MNHLYWMel5GLQjt31MtdqICGwOqKdpiSqlgyKl4 +tc8oPpWOCInWqDfiVGBTa6HuxzRXRapwJQmcUn3mMoE +-> ssh-ed25519 tOH/HQ FvP/QgS68lQ2shSEYU2H01Ob6K6byIHu5ucWxRuGkRg +IWn6/mCBw3dF3ZSd3xj/z0OZ+eyfEbxcGhxjsvaa3Kk +-> ssh-ed25519 FpzvfQ aazsx66iutyUecJF8ntQoYKKKaDXQGuMNliiPQcgPkc +TvALgVwtE6uayvtCXWeuWJaltxQmhWYJrHgFEPQU4oc +-> ssh-ed25519 kdPvzQ BsmX6eCJNCXhAMtww/cWAA6YLBHTrGZFblNnQtXP8XU +UBQF/gfEYe5vQ33uN9OJgA5ri15rzKwx50BD8wa1PTk +-> ssh-ed25519 onmXpg dsyDkjWZmzSe0ELuc9gg+imF4lUsiQM+8TMwN7ZVGDE +cVNjxibG+4D7I5xeLxm/t2hywlXQQV4hoR0S02oxhI8 +-> ssh-ed25519 CnhD0g mR4mb8zZO1iAPLZEIGLXnnUSBXV1LNoJbDCyoYP40j0 +mmvvmoa50pX/ZBf58CM6ezvzH4VietG+htGKf3kp3YA +-> ssh-ed25519 4ep2UA ztxIWLrWXv4bQWrrRs7saq5OVEtMni/RyK0m1hUmBFo +ISMLEMk/LcDYYFRpKtibkCStjkDt9wGYvG8KRgT9YCU +--- QHb9f8vxr/TurYtZvMgFvMMejSLXZn1Ar06vjYMpXQM +wYpΨ :Hlǖe׽1Hsf;t'go#`br*<@j+ѻq#"iLV:3m \ No newline at end of file diff --git a/secrets/gitea/workerPassword.age b/secrets/gitea/workerPassword.age new file mode 100644 index 0000000..e21cdc5 --- /dev/null +++ b/secrets/gitea/workerPassword.age @@ -0,0 +1,39 @@ +age-encryption.org/v1 +-> ssh-ed25519 64uajw qHQu4KXKZwdYvVgnFwETGiEcq0qfrbSh4w3bDZl72hI +p65+VnPmwGJ7Bc0bi8Uo+Flda53PuyaHLmmOKoa6bW8 +-> ssh-ed25519 oyEmTw Wz994CmXI3VYXUua26hi/bO2bz6O8yMECXxWgt0jd1w +PD6i1XskgGuiyoxsa7ZsJgcym0qvFVh9i4JMDiaqPCM +-> ssh-ed25519 mOmPfg tcMq6Caz+d7l3NGG3PpUSh6JTlfcM5tmlhSusQAntic +wF7mG5goqwcGQNrLLlAjlq1SbXs90moT+SBz1XLyEGQ +-> ssh-ed25519 YJiRbw 9XD3CBqZIiF5UIGe27d3afAbuUG4dg5UscFFg7Bn3Sc +o61ER48Z8RF2EaBCcAyn6A2Gzq8VPH3l6hS8EgQdc/8 +-> ssh-ed25519 aY2AXA XrOUfqaQpZU8+wj8fSeSWUILpdU5dxZ4FYL7aSGXJVM +ggtk8ZlJA0Jq2dgY4OOWqa7nN4ScQoJqFvks4IyHTxo +-> ssh-ed25519 xNtnoA BiiaZClF1EZnhlj+sqRnt884tGYWxLX7Ql967Ral1Xw +gTOs9WdS5ZghXDLfmF8fCqppEF5r82y0Lb7IV9nIT8A +-> ssh-ed25519 AQhf1g PUmOw5u7s/x3JN34Kl3p4udqgqzs/pAngDVae51ioxI +Dl66LZD5sOIe++0aksSESfhTdtisngoSygcZQ0cH8a0 +-> ssh-ed25519 B8wa7Q YaOOcD4AGziipW9qdt/HlSZ6vkgg7LbYBAxKytTQRTk +a3vR0kJfmL6QlwtOuZj16AGLTsOrKe2ZlJ05JrredYI +-> ssh-ed25519 8UnW5Q ScXPXQ8y6FOoGX5O43zJX5sIDEIbvTI+b10jTEMQphA +OYQsGXm08DDaI0L67QHapd5Ho6nSwKN/LHk/tS3Xsjg +-> ssh-ed25519 0/WsKg 349HF2euCSqlmd0FmpEcdlS+aedLMU6jJkyKxrNWcHU +G7yYBNd+X3shzEQSyXqvT6imbt3sQIYatNsOBs8JvRs +-> ssh-ed25519 Nl/5yA 0cjRGLWLNwmZ62Z3I4uB3jb3PIukr+KQGq/yfu5As3w +SkM2xp9AArGIGxqAL+Rca2jitdhlK3o/Q0NLmXrak6c +-> ssh-ed25519 GdLgCQ Z1Njo0LQBq+/mtAqAPowekhfHRqMzOvApVU1lM74uQA +OgKlFb5D+10e4Bd4CwHjayRIJeB4F4WY95iWZrmGfEE +-> ssh-ed25519 tOH/HQ 2/q8noX5l5R1znXxUn02Y58m7CTXoqjZJVGM9DiUzxk +XfEChTDo/PEqFTsTiQYo0CGYQtULwNWsmd+LZxL6elg +-> ssh-ed25519 FpzvfQ MRbIYUvWr2Y2S0x1pXsN9PM7QwFbQgrbxm2FKuooGQY +ZPtT/4te0bK8thTxC/3pgQZXUanzmghoWovlSVpFEEo +-> ssh-ed25519 kdPvzQ tyXJNUrsTpNsvKThK6WRlOsSnX7RkBEIQX/5GT827AY +ZyHppG9Hkek/opXmzYISaOJoAb7qyhkNiJCWmmvdrWQ +-> ssh-ed25519 onmXpg t2Ebjajlvra2mNz3PB3xY66xrsmpEQNmpKQRWu1XNWI +9XgRcPwT6m1wH9tx7YQclvQm54zhsudSll6M6SbeW88 +-> ssh-ed25519 CnhD0g bPULnc9Zo+NQSzyilDBz+ENapM2KG0xndcLswCXAa0Q +/KrffEqancG1ik8SS6lWHKefHFeI1BTMKOVu7p2BrZg +-> ssh-ed25519 4ep2UA DDj70fjaRQkOx1SblaTT8L/Dw0VjaDLGLXhpEK0oEHA +sczzaiz8wIm1l8htHqilkEoAU3HIarPh/vl4XzXg1Zg +--- NW0iQF+i4oCXpNJ4Nf5i3RaUobP7IoMv8f/g9jKKEx8 +=JM96Dpp%IY|)FXGB^*q^޻kgå*p^%(v,yb \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a65b746..c55b205 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -86,6 +86,12 @@ in "dendrite.age".publicKeys = everyone; "dendrite_key.age".publicKeys = everyone; + "gitea/buildbotWorkersFile.age".publicKeys = everyone; + "gitea/oauthSecret.age".publicKeys = everyone; + "gitea/oauthToken.age".publicKeys = everyone; + "gitea/webhookSecret.age".publicKeys = everyone; + "gitea/workerPassword.age".publicKeys = everyone; + "gitlab/secret.age".publicKeys = everyone; "gitlab/otp.age".publicKeys = everyone; "gitlab/db.age".publicKeys = everyone;