Update for new Gitea instance

This commit is contained in:
Greg Hellings
2025-12-29 01:50:06 -06:00
parent 6373bea915
commit 489bcb7e51
3 changed files with 38 additions and 69 deletions
+4 -34
View File
@@ -1,6 +1,5 @@
{ {
config, config,
lib,
metadata, metadata,
pkgs, pkgs,
top, top,
@@ -24,6 +23,8 @@ in
]; ];
age.secrets = { age.secrets = {
runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age;
gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age; gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age;
gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age; gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age;
gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age; gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age;
@@ -138,10 +139,6 @@ in
enable = true; enable = true;
protontricks.enable = true; protontricks.enable = true;
}; };
#####################################################################################
#################### Virtualbox Runner ##############################################
#####################################################################################
age.secrets.runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age;
services = { services = {
buildbot-nix = { buildbot-nix = {
@@ -163,10 +160,10 @@ in
gitea = { gitea = {
enable = true; enable = true;
instanceUrl = "https://src.thehellings.com"; instanceUrl = "https://src.thehellings.com";
oauthId = "97bcda21-49df-4876-87ac-36ae07f340ec"; oauthId = "7ec9107d-379b-47c8-870f-1191956d0500";
oauthSecretFile = config.age.secrets.gitea-oauthSecret.path; oauthSecretFile = config.age.secrets.gitea-oauthSecret.path;
tokenFile = config.age.secrets.gitea-oauthToken.path; tokenFile = config.age.secrets.gitea-oauthToken.path;
#topic = "buildbot-greg"; topic = "buildbot-nix";
webhookSecretFile = config.age.secrets.gitea-webhookSecret.path; webhookSecretFile = config.age.secrets.gitea-webhookSecret.path;
}; };
showTrace = true; showTrace = true;
@@ -204,32 +201,5 @@ in
}; };
}; };
systemd = {
services = {
"gitlab-runner" = {
after = [
"network.target"
"network-online.target"
"tailscaled.service"
];
requires = [
"network-online.target"
"tailscaled.service"
];
serviceConfig = {
DevicePolicy = lib.mkForce "auto";
User = "root";
DynamicUser = lib.mkForce false;
};
};
};
targets = {
sleep.enable = false;
suspend.enable = false;
hibernate.enable = false;
hybrid-sleep.enable = false;
};
};
users.extraGroups.video.members = [ "greg" ]; users.extraGroups.video.members = [ "greg" ];
} }
Binary file not shown.
+34 -35
View File
@@ -1,36 +1,35 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 87huqg +vGKJWJF+cULuu6iVaX6cgGoaAeKUoEee4vGyaFpI2w -> ssh-ed25519 87huqg FaiN3ippcpcxcI+nCAUgBoKUF65mFC2xwvupSgDVhzs
N93+n31fWF9gwJ47JIa3IhA32PtpZC3gNX26LXF9+9Y kV2k3NKXdqwnJqHsDyof4blc+CxHj+Xuz2RySap/mwM
-> ssh-ed25519 UFfTmg qy00MSIs3WLDSWm1R2d6NwonFKs85d9u/FnPDv0Tj38 -> ssh-ed25519 UFfTmg DMiGAsTR3E9hqW68M+oW1F9/wTPa0J8HY7O3Ir/4CQ8
mNliwCIFNVaEB3/KihdX4KCrqIXW6fF2zAPRMW4Ynn4 JVYVroeE0fI0dDkj2TLImb/TxQGrulOubFswLzzWUNY
-> ssh-ed25519 xNtnoA VgJb+XhCU9H7hv6MiBrrn9ObbOzMCdW8AHf6Qc18wms -> ssh-ed25519 xNtnoA 1s3lCnko26npB/TaQ6RqOcAxhL+rvCsTZa3i47/3OCQ
noHjCNW5P2CSHtADe5jaJ6cQ8Of0U+AX2XZdPvJSLYY q/eW4nemPqQ+NIM6sY4AEC74+Q4ts449D0DRSsfbCpw
-> ssh-ed25519 aY2AXA UItoGwNQ0R5aQe6u8R6lAjGOqUA5Ft/g32KkiQ2U1Hg -> ssh-ed25519 aY2AXA 3/kMT0KaXLGb9WgYsyJiy2/Q2e/BVeAEJ8TpU0MraC8
dgP9kezC5mlHzlpUgq2cK6iW/xk6HPT2yxQ8lrpUggI 2WLbSbxCTuuKe7op3JVZqFADk3pZDL8MZeIgecW6ysI
-> ssh-ed25519 AQhf1g p1m4ZKVxumlVIGRpagEN3uuehlT381x8KYRV/Fh4rio -> ssh-ed25519 AQhf1g tGyMM0/jIm4iRMW3omb+hAv2ptOana2TeKDwrk0lcXI
/OjBxcGXFCwMX0EayIK7LVy/+3ySVPIwdW+JOlqbFEo aTP3w3XBW+UG3ZKWa1fCtmwjJ/CPDtYI35fW3xs21z8
-> ssh-ed25519 mOmPfg a6G4AaBn9nH+TwP0n5YpPlIdkOf6pfLNlJwu3z9ikHE -> ssh-ed25519 mOmPfg ZGlYlzAxcLnfH5ajyarlgb6ai8S+EPj0McDRoeeJwSU
QAr2dwZqQAJMwKcSqKWBbQMEl7CS62eyziTobQtdbaU nnDDJQuaDPsv6XautBqktDTmcP/e2fpVGHLidfxgH98
-> ssh-ed25519 YJiRbw glcvmIFcNql9Neyj0bO7P16KBaHt5ImQlaVhHR9c2m8 -> ssh-ed25519 YJiRbw puid9qEgO15ZAQu9UJHTBByXhjAYdkRuifqpKiPyBzc
6wm+IILVqxAxTzuJwFLFAhyd4G0em51CV7k6iEUfE4c ip4Iudphrq7ee+ftGiG9L1KClxXs81iv9ZYxtysb33g
-> ssh-ed25519 0/WsKg 3UwZTJqvW8r0Zkh+AhuP9yNLpGkqRz5k04ETWGEq1zY -> ssh-ed25519 0/WsKg PjNCT+o7/ceTAwL1O3ylDvHpQksFJeGWiRRJPLM780U
TFQWBAXz0u1o9D9HODVHZp7zklYsn99cfoSnDtn6Zgw C2UGCNYG0P6lJ4WRlrrvBUHJNsJe9lKRAlRkvjBSljo
-> ssh-ed25519 Nl/5yA mENQJ+E702sdXC/JqsreYhWwfScN1o3LeDvj9C/BcCs -> ssh-ed25519 Nl/5yA nq3+6B/CE4Dm4V/uoYO1wMUQGFBepxb86ovtA64icVA
IbeMgUqNx7qyrIC3ZwGMlxo6Elg9CeFHgTnUJQVfLQ0 sXOJVbrrjMpK3tpaJOx4I5UylACFTQk3Kgkb0U04HZQ
-> ssh-ed25519 GdLgCQ W0uEyxaJvO7wz9UYBRE0cv+VGeyYa8Z6iyTpPN2DvWE -> ssh-ed25519 GdLgCQ 1+AlaHiMguVVCozkhhbkESc0Uzf/+lLjh9p2nYhzem0
eegDs3uVmH9rqVd5sE9zubBMqdxHT8jJPxHDfk8Kusg hEFBD17NpkfPlSR/13qZJVtuMvLHEaveNBvtNx3ifBE
-> ssh-ed25519 tOH/HQ QT9SrVYYY8ODW4tIeAEfNakwWHo4RyPvQle2E/3jGm0 -> ssh-ed25519 tOH/HQ GOdOyjDZuRkNbq4xO5hKl7bAOYGYgpYhZ0ySXFL36Vg
duQtW1MWE+MTtxMBT2Mvps8J08BYRcmdeRXFfL4B9RY ravlDE/qkTlF0QBZL0m3XDCyQDSi+YiTQbsKgVoo0W4
-> ssh-ed25519 FpzvfQ zIF2xJFiaC1y3V67q3YP6ql8mbyrpO+O2b6dW1mm4XM -> ssh-ed25519 FpzvfQ hmdZm1akUfe65XR15qkPG/9L0wohcBmNVU2Dl54ccAI
37r/nLDwJmkjr1QQY8tTijPtqufEqBOeaxota2umwxI xGdvMhDlp+mMDnVTI2pmXeIOkg7Q3NWEEn0pQhYptHU
-> ssh-ed25519 kdPvzQ cP81EXGaO/IUqxrxzlXDweTSPBZlRGCl6x9dn+rkOHc -> ssh-ed25519 kdPvzQ 2yEYstEqe7dRRA3xJAPWsS6pWoVhHWgniF7tDU/DiBE
NVCJA0h7ZLr/BcNDfZPrZAJZWtpZxT4VJ1FGA+Qcpe4 wQcwV9YtB1wqV/Rh/mXDRvvTlHi9zt7s9FfA+nl9tl4
-> ssh-ed25519 onmXpg 8hx4rthfVY5SfRXvq1wlD0lTtWPsEh3pxpDjzBqEJRE -> ssh-ed25519 onmXpg EtohxlbytPxdjQ2+WGa31szA2pcNfpjTSjywxdsP41Q
I79UvaGkDwg5EvwCwe+XlR/YLbqNCJGi+XVYiz27msw CLm2PML6ftK5sEL06YM+uzp3u6B3H6puIR0ZZjwdStI
-> ssh-ed25519 CnhD0g sx5bqqrA/N9kQbX5uWWi9qYq8dZPUEQl/f9gxQQUzTM -> ssh-ed25519 CnhD0g HBmCksCnULHjHY46ROD9nEsF1+MgmpvI7BsC7hqIOyg
/v612wQyNIKttHLtfqtW5tqgsj9DnD94CPfZAVy1SK0 2ibCG8YHM1+cmKga6IYunbC9m7ZeKt/A+uXhCI4Q6KA
-> ssh-ed25519 4ep2UA 29aXaZNK5IDqjr33hN9gZ2Xa/A8Fo6iQTRkhV2I9nCs -> ssh-ed25519 4ep2UA gPaSut9Q6VsR45d4BaeqvYFav4WJR1z1JaFMbzZjv2U
24wTdQcRPPRmpmYNw2JM2Mr8DKY8lS9dUigB48UKXRY wcEudPepWaRFJZa0Fp/KnzUZQyzJRu7oGgazojSNzss
--- IBC4Vix1Ft0GRMOcBmErrrMODnbJAoGNzTxe4x5DlIs --- cn+bvbDY6o6mnhowncq4qmCn+MydUMXG/iIM2sIKq4Q
.ÅáR°õÀž‘ ȸÔ4œ<ek­Á‘tôýº™ [ÓæÕ妸 •x rÝX…bˆeA‡U␍½Ë}&zLC¦)+rÓÌ=Ñë8—½ÍžËEäaƒ‰w␍B$*ü§^*+ØG5™Í‰íÄS®
”D␍xœ•Ö³ÝâxßÓ¶+êF\ŒL{×¥ü0Éê’[2g