Skip to content

feat: fod checker #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Conni2461 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: fod checker #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e89ce1
fix(macos): home directory for hydra-queue-builder and bump queue-bui…
Conni2461 Nov 25, 2025
6876c65
feat: deploy fod-checker
Conni2461 Nov 30, 2025
1492600
feat: nix/fod firewall deployment
Conni2461 Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 40 additions & 22 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable-helsinki.url = "github:helsinki-systems/nixpkgs/feat/nix-daemon-firewall";
# Why?
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
Expand Down Expand Up @@ -33,7 +34,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
infra = {
url = "github:nixos/infra";
url = "github:helsinki-systems/nixos-infra/upd/queue-runner";
inputs = {
nixpkgs.follows = "nixpkgs";
nixpkgs-unstable.follows = "nixpkgs-unstable";
Expand Down
2 changes: 1 addition & 1 deletion macs/module/hydra-queue-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ in
users.hydra-queue-builder = {
uid = lib.mkDefault 535;
gid = lib.mkDefault config.users.groups.hydra.gid;
home = lib.mkDefault "/var/lib/hydra-queue-builder";
home = "/private/var/lib/hydra-queue-builder";
shell = "/bin/bash";
description = "hydra-queue-builder service user";
};
Expand Down
4 changes: 3 additions & 1 deletion non-critical-infra/hosts/build04.ofborg.org/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
services.hydra-queue-builder-v2 = {
enable = true;
queueRunnerAddr = "https://queue-runner.staging-hydra.nixos.org";
maxJobs = 2;
maxJobs = 4;
supportedFeatures = [ "fod-checker" ];
mandatoryFeatures = [ "fod-checker" ];
mtls = {
serverRootCaCertPath = "${inputs.infra}/non-critical-infra/hosts/staging-hydra/ca.crt";
clientCertPath = "${./client.crt}";
Expand Down
4 changes: 3 additions & 1 deletion non-critical-infra/hosts/eval04.ofborg.org/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@
services.hydra-queue-builder-v2 = {
enable = true;
queueRunnerAddr = "https://queue-runner.staging-hydra.nixos.org";
maxJobs = 2;
maxJobs = 4;
supportedFeatures = [ "fod-checker" ];
mandatoryFeatures = [ "fod-checker" ];
mtls = {
serverRootCaCertPath = "${inputs.infra}/non-critical-infra/hosts/staging-hydra/ca.crt";
clientCertPath = "${./client.crt}";
Expand Down
20 changes: 19 additions & 1 deletion non-critical-infra/modules/ofborg/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,27 @@
"${inputs.infra}/modules/common.nix"
"${inputs.infra}/non-critical-infra/modules/common.nix"
./ofborg-config.nix
"${inputs.nixpkgs-unstable-helsinki}/nixos/modules/services/system/nix-daemon-firewall.nix"
];

nix.gc.automatic = true;
nix = {
gc.automatic = true;
firewall = {
enable = true;
allowedTCPPorts = [
21 # access to ftp files
22 # fetchGit
34
"http"
443
"30000-31000"
];
allowedUDPPorts = [
53 # DNS
443 # QUIC/HTTP3
];
};
};

# TODO wire up exporters
# TODO loki
Expand Down