buildbot + caddy 22
This commit is contained in:
1 parent
34607e944b
commit
4d1a269e00
16 files changed
+239
-28
No files matched your search
Generated
+46
-3
@@ -210,6 +210,27 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"buildbot-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790494266,
|
||||
"narHash": "sha256-CfIzoqCxhHE6mnV/t0zfFi59kMEh0r3VadbQ8vhF9/0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "buildbot-nix",
|
||||
"rev": "76ac471f531a3d2faa5c47b32a0eea271724ee18",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "buildbot-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"cachix": {
|
||||
"inputs": {
|
||||
"devenv": [
|
||||
@@ -1090,7 +1111,7 @@
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nutest": "nutest",
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790696013,
|
||||
@@ -2440,7 +2461,7 @@
|
||||
"devenv",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788165251,
|
||||
@@ -3082,6 +3103,7 @@
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"ai-usagebar": "ai-usagebar",
|
||||
"buildbot-nix": "buildbot-nix",
|
||||
"dank-greeter": "dank-greeter",
|
||||
"determinate": "determinate",
|
||||
"disko": "disko",
|
||||
@@ -3451,6 +3473,27 @@
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"buildbot-nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786901030,
|
||||
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hermenix",
|
||||
@@ -3473,7 +3516,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"treefmt-nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hermenix",
|
||||
|
||||
@@ -89,6 +89,11 @@
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# CI (buildbot-nix)
|
||||
buildbot-nix = {
|
||||
url = "github:nix-community/buildbot-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
};
|
||||
outputs =
|
||||
{ self
|
||||
@@ -119,6 +124,7 @@
|
||||
, herdr
|
||||
, disko
|
||||
, ai-usagebar
|
||||
, buildbot-nix
|
||||
}:
|
||||
let
|
||||
# Libs
|
||||
@@ -155,6 +161,11 @@
|
||||
stack2 = ./secrets/stack2.age;
|
||||
portainer-agent-minipc3 = ./secrets/portainer-agent-minipc3.age;
|
||||
portainer-cert = ./configs/pki/portainer.app.internal.crt;
|
||||
buildbot-worker-password-minipc3 = ./secrets/buildbot-worker-password-minipc3.age;
|
||||
buildbot-worker-password-fwdesk = ./secrets/buildbot-worker-password-fwdesk.age;
|
||||
buildbot-gitea-token = ./secrets/buildbot-gitea-token.age;
|
||||
buildbot-gitea-webhook-secret = ./secrets/buildbot-gitea-webhook-secret.age;
|
||||
buildbot-gitea-oauth-secret = ./secrets/buildbot-gitea-oauth-secret.age;
|
||||
};
|
||||
inherit
|
||||
hyprlauncher
|
||||
@@ -315,6 +326,7 @@
|
||||
./hosts/hl-fwdesk
|
||||
nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
|
||||
hermenix.nixosModules.default
|
||||
buildbot-nix.nixosModules.buildbot-worker
|
||||
];
|
||||
};
|
||||
hl-bigbox1 = lib.makeNixOs {
|
||||
@@ -346,6 +358,8 @@
|
||||
hostName = "hl-minipc3";
|
||||
configuration = [
|
||||
./hosts/hl-minipc3
|
||||
buildbot-nix.nixosModules.buildbot-master
|
||||
buildbot-nix.nixosModules.buildbot-worker
|
||||
];
|
||||
};
|
||||
hl-pi1 = lib.makeSdImage {
|
||||
|
||||
+14
-14
@@ -28,20 +28,20 @@ hosts/
|
||||
|
||||
## Managed Hosts
|
||||
|
||||
| Folder | Host | Role |
|
||||
| ------------- | ---------- | -------------------------------------------------------------------------------------------------- |
|
||||
| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver |
|
||||
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation |
|
||||
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node |
|
||||
| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) |
|
||||
| `hl-bigbox2/` | hl-bigbox2 | NFS storage server |
|
||||
| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI) |
|
||||
| `hl-minipc2/` | hl-minipc2 | Container/media server |
|
||||
| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`) |
|
||||
| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only |
|
||||
| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only |
|
||||
| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup |
|
||||
| `iso/` | iso | Bootable NixOS installer image |
|
||||
| Folder | Host | Role |
|
||||
| ------------- | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver |
|
||||
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation; buildbot-nix CI worker (4 cores) |
|
||||
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node |
|
||||
| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) |
|
||||
| `hl-bigbox2/` | hl-bigbox2 | NFS storage server |
|
||||
| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI) |
|
||||
| `hl-minipc2/` | hl-minipc2 | Container/media server |
|
||||
| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`, plus `gitea.skyg.ca` HTTP/SSH); buildbot-nix CI master + worker (2 cores) |
|
||||
| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only |
|
||||
| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only |
|
||||
| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup |
|
||||
| `iso/` | iso | Bootable NixOS installer image |
|
||||
|
||||
## Rules
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
{ config, skyg-secrets, ... }:
|
||||
let
|
||||
# Must match the master's domain on hl-minipc3.
|
||||
masterDomain = "minipc3.lab.internal";
|
||||
in
|
||||
{
|
||||
age.secrets.buildbot-worker-password-fwdesk.file = skyg-secrets.buildbot-worker-password-fwdesk;
|
||||
|
||||
services.buildbot-nix.worker = {
|
||||
enable = true;
|
||||
name = "hl-fwdesk";
|
||||
workers = 4;
|
||||
masterUrl = "tcp:host=${masterDomain}:port=9989";
|
||||
workerPasswordFile = config.age.secrets.buildbot-worker-password-fwdesk.path;
|
||||
};
|
||||
}
|
||||
@@ -6,5 +6,6 @@
|
||||
./hermenix.nix
|
||||
./wyoming.nix
|
||||
./steam.nix
|
||||
./buildbot.nix
|
||||
];
|
||||
}
|
||||
@@ -24,6 +24,8 @@ in
|
||||
GITEA__server__DOMAIN = domain;
|
||||
GITEA__server__ROOT_URL = "https://${domain}/";
|
||||
GITEA__server__HTTP_PORT = "80";
|
||||
GITEA__server__SSH_DOMAIN = domain;
|
||||
GITEA__server__SSH_PORT = "22";
|
||||
GITEA__service__DISABLE_REGISTRATION = "true";
|
||||
};
|
||||
volumes = [ "public-gitea-data:/data" ];
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{ config, lib, pkgs, skyg-secrets, ... }:
|
||||
let
|
||||
# Internal-only: reachable on the LAN, no nginx/TLS. The host's own
|
||||
# lab.internal name already resolves via the router.
|
||||
domain = "minipc3.lab.internal";
|
||||
port = 8010;
|
||||
|
||||
# Worker credentials are assembled at runtime from the per-host password
|
||||
# secrets (secret values aren't readable at eval time), so there is no
|
||||
# combined workers-JSON secret.
|
||||
workers = [
|
||||
{
|
||||
name = "hl-minipc3";
|
||||
cores = 2;
|
||||
passwordFile = config.age.secrets.buildbot-worker-password-minipc3.path;
|
||||
}
|
||||
{
|
||||
name = "hl-fwdesk";
|
||||
cores = 4;
|
||||
passwordFile = config.age.secrets.buildbot-worker-password-fwdesk.path;
|
||||
}
|
||||
];
|
||||
workersFile = "/run/buildbot-workers.json";
|
||||
# jq identifiers can't contain '-', so sanitize the worker name for --arg.
|
||||
jqVar = w: "pw_" + lib.replaceStrings [ "-" ] [ "_" ] w.name;
|
||||
jqArgs = lib.concatMapStrings (w: "--arg ${jqVar w} \"$(cat ${w.passwordFile})\" ") workers;
|
||||
jqFilter = "["
|
||||
+ lib.concatMapStringsSep ","
|
||||
(w:
|
||||
"{name:${builtins.toJSON w.name},pass:$${jqVar w},cores:${toString w.cores}}")
|
||||
workers
|
||||
+ "]";
|
||||
in
|
||||
{
|
||||
age.secrets.buildbot-worker-password-minipc3.file = skyg-secrets.buildbot-worker-password-minipc3;
|
||||
age.secrets.buildbot-worker-password-fwdesk.file = skyg-secrets.buildbot-worker-password-fwdesk;
|
||||
age.secrets.buildbot-gitea-token.file = skyg-secrets.buildbot-gitea-token;
|
||||
age.secrets.buildbot-gitea-webhook-secret.file = skyg-secrets.buildbot-gitea-webhook-secret;
|
||||
age.secrets.buildbot-gitea-oauth-secret.file = skyg-secrets.buildbot-gitea-oauth-secret;
|
||||
|
||||
services.buildbot-master.port = port;
|
||||
|
||||
services.buildbot-nix.master = {
|
||||
enable = true;
|
||||
domain = domain;
|
||||
enableNginx = false;
|
||||
useHTTPS = false;
|
||||
admins = [ "ari" ];
|
||||
workersFile = workersFile;
|
||||
authBackend = "gitea";
|
||||
gitea = {
|
||||
enable = true;
|
||||
instanceUrl = "http://gitea.app.internal:3000";
|
||||
tokenFile = config.age.secrets.buildbot-gitea-token.path;
|
||||
webhookSecretFile = config.age.secrets.buildbot-gitea-webhook-secret.path;
|
||||
# Client ID of the Gitea OAuth2 app (public value; secret lives in the age file).
|
||||
oauthId = "buildbot-nix";
|
||||
oauthSecretFile = config.age.secrets.buildbot-gitea-oauth-secret.path;
|
||||
topic = "build-with-buildbot";
|
||||
};
|
||||
};
|
||||
|
||||
# The module derives buildbotUrl without the port; keep links/webhooks correct.
|
||||
services.buildbot-master.buildbotUrl = lib.mkForce "http://${domain}:${toString port}/";
|
||||
|
||||
# Assemble the workers JSON from the per-host password secrets at start.
|
||||
systemd.services.buildbot-workers-file = {
|
||||
description = "Assemble buildbot-nix workers JSON from agenix secrets";
|
||||
before = [ "buildbot-master.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
UMask = "0077";
|
||||
};
|
||||
script = ''
|
||||
${pkgs.jq}/bin/jq -n ${jqArgs} '${jqFilter}' > ${workersFile}
|
||||
'';
|
||||
};
|
||||
systemd.services.buildbot-master = {
|
||||
wants = [ "buildbot-workers-file.service" ];
|
||||
after = [ "buildbot-workers-file.service" ];
|
||||
};
|
||||
|
||||
services.buildbot-nix.worker = {
|
||||
enable = true;
|
||||
name = "hl-minipc3";
|
||||
workers = 2;
|
||||
masterUrl = "tcp:host=${domain}:port=9989";
|
||||
workerPasswordFile = config.age.secrets.buildbot-worker-password-minipc3.path;
|
||||
};
|
||||
}
|
||||
@@ -14,9 +14,20 @@ in
|
||||
autoUpdate.enable = true;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
services.caddy = {
|
||||
image = "caddy:2-alpine";
|
||||
image = "livekit/caddyl4:v2.11.3";
|
||||
extraConfig.entrypoint = [ "caddy" ];
|
||||
command = [ "run" "--config" "/etc/caddy/Caddyfile" "--adapter" "caddyfile" ];
|
||||
networks.lan.ipv4_address = app.ip;
|
||||
files."/etc/caddy/Caddyfile" = ''
|
||||
{
|
||||
layer4 {
|
||||
:22 {
|
||||
route {
|
||||
proxy ${publicGitea.ip}:22
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
nvr.home.sosnovsky.ca {
|
||||
tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem
|
||||
reverse_proxy ${nvr.ip}:11080
|
||||
|
||||
@@ -2,5 +2,6 @@
|
||||
imports = [
|
||||
./caddy.nix
|
||||
./acme.nix
|
||||
./buildbot.nix
|
||||
];
|
||||
}
|
||||
@@ -42,4 +42,11 @@ in
|
||||
"secrets/lab-ca-key.age".publicKeys = [ ari ];
|
||||
"secrets/buzz-tls-key.age".publicKeys = [ ari minipc1 ];
|
||||
"secrets/portainer-tls-key.age".publicKeys = [ ari minipc2 ];
|
||||
|
||||
# buildbot-nix CI (master on minipc3, workers on minipc3 + fwdesk)
|
||||
"secrets/buildbot-worker-password-minipc3.age".publicKeys = [ ari minipc3 ];
|
||||
"secrets/buildbot-worker-password-fwdesk.age".publicKeys = [ ari minipc3 fwdesk ];
|
||||
"secrets/buildbot-gitea-token.age".publicKeys = [ ari minipc3 ];
|
||||
"secrets/buildbot-gitea-webhook-secret.age".publicKeys = [ ari minipc3 ];
|
||||
"secrets/buildbot-gitea-oauth-secret.age".publicKeys = [ ari minipc3 ];
|
||||
}
|
||||
+15
-10
@@ -4,16 +4,21 @@ Age-encrypted secret files managed with [agenix](https://github.com/ryantm/ageni
|
||||
|
||||
## Contents
|
||||
|
||||
| File | Description |
|
||||
| ----------------------------- | ---------------------------------------------- |
|
||||
| `dns-addresses.conf.age` | DNS address overrides for the dnsmasq module |
|
||||
| `glmain.json.age` | OpenWrt router credentials/config for `glmain` |
|
||||
| `hermes-env.age` | Hermes agent env vars (fwbook + fwdesk) |
|
||||
| `hermes-env` | Unencrypted working copy of `hermes-env.age` |
|
||||
| `iu-project.age` | iu-project credentials (minipc1) |
|
||||
| `portainer-agent-bigbox1.age` | Portainer agent env vars (bigbox1) |
|
||||
| `stack1.age` | Compose definition for stack1 (minipc2) |
|
||||
| `stack2.age` | Compose definition for stack2 (minipc2) |
|
||||
| File | Description |
|
||||
| -------------------------------------- | ------------------------------------------------- |
|
||||
| `dns-addresses.conf.age` | DNS address overrides for the dnsmasq module |
|
||||
| `glmain.json.age` | OpenWrt router credentials/config for `glmain` |
|
||||
| `hermes-env.age` | Hermes agent env vars (fwbook + fwdesk) |
|
||||
| `hermes-env` | Unencrypted working copy of `hermes-env.age` |
|
||||
| `iu-project.age` | iu-project credentials (minipc1) |
|
||||
| `portainer-agent-bigbox1.age` | Portainer agent env vars (bigbox1) |
|
||||
| `stack1.age` | Compose definition for stack1 (minipc2) |
|
||||
| `stack2.age` | Compose definition for stack2 (minipc2) |
|
||||
| `buildbot-worker-password-minipc3.age` | buildbot-nix worker password (minipc3) |
|
||||
| `buildbot-worker-password-fwdesk.age` | buildbot-nix worker password (fwdesk) |
|
||||
| `buildbot-gitea-token.age` | Gitea access token for buildbot (minipc3) |
|
||||
| `buildbot-gitea-webhook-secret.age` | Gitea webhook secret for buildbot (minipc3) |
|
||||
| `buildbot-gitea-oauth-secret.age` | Gitea OAuth2 client secret for buildbot (minipc3) |
|
||||
|
||||
The authoritative list of names + authorized keys is `secrets.nix` in the repo root.
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CIR0mA MZHddRKKINlOjaZq4KeZv0ZbUlqHF72rSWaM8Gp9YEQ
|
||||
dYvdCXVxJl/jqfzVCvWFOzpnZVLr4zDbeyo384EHUqA
|
||||
-> ssh-ed25519 So2Y2A lGsCiYTRNOTqY+XPtA/4b3L6aoS277CPBpJAYNBR+Bs
|
||||
Q6rwNPEPENCz1f7RL1ugsz4UG3zh3bwIIIIFQzNrhDI
|
||||
--- PECFTeXNGLXQn7oRM3/RQD4RoPYl+Udyt30iWLWvQ/s
|
||||
Uèzy¡íÈC�œ7ŒŸJJè÷;ÓiÍdî÷‘ê†dGN((d‹‘YñX9£.‚#*š¦Ll·–N¼óêå/t:ÓrÅ·Æw9€®‘�hZ”eÎ0‹‘o²¢
|
||||
@@ -0,0 +1,7 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CIR0mA R/k75aPb/6UY7hC2sNLDnJBN0SzS1gLxCKV5/6k14lo
|
||||
Ia2f/UVHOOyAOKIWQDQBGUA4tBQCC9I+jI8HKngdDgc
|
||||
-> ssh-ed25519 So2Y2A kMKHgmMXFv/FFpxG4afwDFu3EYY6dRHEDIMB+413VyQ
|
||||
ohCZhQSOc8nB6F+VOMqLJsmzkydg/+wDJTeGbPyiWz4
|
||||
--- YJueYHrRUK8D0Jz+V9vXPPNOIpT0GGcIyKJ4u72qluY
|
||||
Pp6~_Ñ} ЉêÝc,a}Õár£8í¥Y=dA¨ €ßŠñ|90%ay·�FÊ(HTª»±” ñ°gó§?m^a˜*Ÿ2�
|
||||
@@ -0,0 +1,7 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CIR0mA q9gHASCHMVma89r38UB+SQhOfvJh+fTn6cDde+VokyI
|
||||
NwJV0BDtHtR76S1gnobJ/sCf72X7Jgh/aX9zdppJQrg
|
||||
-> ssh-ed25519 So2Y2A bA0FjhApSVVz5KihvhT/dYrSH5amAUX2j7b9IaZ1YSQ
|
||||
1m1Tq0ib8kQbRXTCx+kiBEN/LG8mmfrlnVqCFZAYQtM
|
||||
--- ClysLz304nxJUBJH8gx5VPE3FKJTtgntVj2b4czSJC8
|
||||
³=@b)[|[HÜúcmd1‰ÏÝ2L˜8Ú_`ùèo³§0Ñ^"¡Ö<¬ÁІúO>af¥æiü~$¥ÿŸ…\q:±Pfåÿ¨3€#„c1‘ö—xByóxÈñÀò»EÏÇ
|
||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user