Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
f9dfebb1b5
65
flake.lock
65
flake.lock
|
@ -1,5 +1,48 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"buildbot-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1717033539,
|
||||||
|
"narHash": "sha256-vWQLnmZSipvaosXnGze8aSqlEzaAF9PhA5sh2QYNvTc=",
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "buildbot-nix",
|
||||||
|
"rev": "ad165ae64f877adc6156b8f21c31fc74144dc8e4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "buildbot-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"buildbot-nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1715865404,
|
||||||
|
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-writers": {
|
"nix-writers": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -34,9 +77,31 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"buildbot-nix": "buildbot-nix",
|
||||||
"nix-writers": "nix-writers",
|
"nix-writers": "nix-writers",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"buildbot-nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1715940852,
|
||||||
|
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -7,15 +7,18 @@
|
||||||
};
|
};
|
||||||
# disko.url = "github:nix-community/disko";
|
# disko.url = "github:nix-community/disko";
|
||||||
# disko.inputs.nixpkgs.follows = "nixpkgs";
|
# disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
buildbot-nix.url = "github:Mic92/buildbot-nix";
|
||||||
|
buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
description = "stockholm";
|
description = "stockholm";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nix-writers }: {
|
outputs = { self, nixpkgs, nix-writers, buildbot-nix, ... }@inputs: {
|
||||||
nixosConfigurations = nixpkgs.lib.mapAttrs (machineName: _: nixpkgs.lib.nixosSystem {
|
nixosConfigurations = nixpkgs.lib.mapAttrs (machineName: _: nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs.stockholm = self;
|
specialArgs.stockholm = self;
|
||||||
specialArgs.nix-writers = nix-writers;
|
specialArgs.nix-writers = nix-writers;
|
||||||
|
specialArgs.buildbot-nix = buildbot-nix;
|
||||||
modules = [
|
modules = [
|
||||||
./krebs/1systems/${machineName}/config.nix
|
./krebs/1systems/${machineName}/config.nix
|
||||||
{
|
{
|
||||||
|
|
|
@ -211,6 +211,7 @@ in {
|
||||||
bookmark.euer IN A ${nets.internet.ip4.addr}
|
bookmark.euer IN A ${nets.internet.ip4.addr}
|
||||||
boot IN A ${nets.internet.ip4.addr}
|
boot IN A ${nets.internet.ip4.addr}
|
||||||
boot.euer IN A ${nets.internet.ip4.addr}
|
boot.euer IN A ${nets.internet.ip4.addr}
|
||||||
|
build.euer IN A ${nets.internet.ip4.addr}
|
||||||
cache.euer IN A ${nets.internet.ip4.addr}
|
cache.euer IN A ${nets.internet.ip4.addr}
|
||||||
cache.gum IN A ${nets.internet.ip4.addr}
|
cache.gum IN A ${nets.internet.ip4.addr}
|
||||||
cgit.euer IN A ${nets.internet.ip4.addr}
|
cgit.euer IN A ${nets.internet.ip4.addr}
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
../../../krebs/2configs
|
../../../krebs/2configs
|
||||||
../../../krebs/2configs/nginx.nix
|
../../../krebs/2configs/nginx.nix
|
||||||
|
|
||||||
../../../krebs/2configs/buildbot-stockholm.nix
|
|
||||||
../../../krebs/2configs/binary-cache/nixos.nix
|
../../../krebs/2configs/binary-cache/nixos.nix
|
||||||
../../../krebs/2configs/ircd.nix
|
../../../krebs/2configs/ircd.nix
|
||||||
../../../krebs/2configs/reaktor2.nix
|
../../../krebs/2configs/reaktor2.nix
|
||||||
|
@ -15,6 +14,10 @@
|
||||||
../../../krebs/2configs/mud.nix
|
../../../krebs/2configs/mud.nix
|
||||||
../../../krebs/2configs/repo-sync.nix
|
../../../krebs/2configs/repo-sync.nix
|
||||||
|
|
||||||
|
../../../krebs/2configs/buildbot-stockholm.nix
|
||||||
|
#../../../krebs/2configs/buildbot/master.nix
|
||||||
|
#../../../krebs/2configs/buildbot/worker.nix
|
||||||
|
|
||||||
../../../krebs/2configs/cal.nix
|
../../../krebs/2configs/cal.nix
|
||||||
../../../krebs/2configs/mastodon.nix
|
../../../krebs/2configs/mastodon.nix
|
||||||
|
|
||||||
|
|
33
krebs/2configs/buildbot/master.nix
Normal file
33
krebs/2configs/buildbot/master.nix
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{buildbot-nix,...}:
|
||||||
|
let
|
||||||
|
#domain = "buildbot.krebsco.de";
|
||||||
|
domain = "build.hotdog.r";
|
||||||
|
in {
|
||||||
|
imports = [
|
||||||
|
buildbot-nix.nixosModules.buildbot-master
|
||||||
|
];
|
||||||
|
|
||||||
|
#services.nginx.virtualHosts."${domain}" = {
|
||||||
|
# enableACME = true;
|
||||||
|
# forceSSL = true;
|
||||||
|
#};
|
||||||
|
|
||||||
|
|
||||||
|
services.buildbot-nix.master = {
|
||||||
|
enable = true;
|
||||||
|
admins = [ "makefu" ];
|
||||||
|
buildSystems = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
|
inherit domain;
|
||||||
|
evalMaxMemorySize = "4096";
|
||||||
|
evalWorkerCount = 16;
|
||||||
|
workersFile = "/var/src/secrets/buildbot/nix-workers";
|
||||||
|
github = {
|
||||||
|
tokenFile = "/var/src/secrets/buildbot/github-token";
|
||||||
|
webhookSecretFile = "/var/src/secrets/buildbot/github-webhook-secret";
|
||||||
|
oauthSecretFile = "/var/src/secrets/buildbot/github-oauth-secret";
|
||||||
|
oauthId = "Ov23lizFP7t7qoE9FuDA";
|
||||||
|
user = "krebs-bob";
|
||||||
|
topic = "buildbot";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
11
krebs/2configs/buildbot/worker.nix
Normal file
11
krebs/2configs/buildbot/worker.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{ buildbot-nix, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
buildbot-nix.nixosModules.buildbot-worker
|
||||||
|
];
|
||||||
|
|
||||||
|
services.buildbot-nix.worker = {
|
||||||
|
enable = true;
|
||||||
|
workerPasswordFile = "/var/src/secrets/nix-worker-file";
|
||||||
|
};
|
||||||
|
}
|
|
@ -28,7 +28,7 @@ with import ../../lib/pure.nix { inherit lib; };
|
||||||
networking.hostName = config.krebs.build.host.name;
|
networking.hostName = config.krebs.build.host.name;
|
||||||
|
|
||||||
nix.maxJobs = 1;
|
nix.maxJobs = 1;
|
||||||
nix.useSandbox = true;
|
nix.settings.sandbox = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git
|
git
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, lib, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
services.matterbridge = {
|
services.matterbridge = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configPath = let
|
configPath = let
|
||||||
|
|
Loading…
Reference in a new issue