Skip to content

Commit 1492600

Browse files
committed
feat: nix/fod firewall deployment
1 parent 6876c65 commit 1492600

File tree

5 files changed

+39
-3
lines changed

5 files changed

+39
-3
lines changed

flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
44
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
5+
nixpkgs-unstable-helsinki.url = "github:helsinki-systems/nixpkgs/feat/nix-daemon-firewall";
56
# Why?
67
flake-parts.url = "github:hercules-ci/flake-parts";
78
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";

non-critical-infra/hosts/build04.ofborg.org/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
services.hydra-queue-builder-v2 = {
4646
enable = true;
4747
queueRunnerAddr = "https://queue-runner.staging-hydra.nixos.org";
48-
maxJobs = 2;
48+
maxJobs = 4;
4949
supportedFeatures = [ "fod-checker" ];
5050
mandatoryFeatures = [ "fod-checker" ];
5151
mtls = {

non-critical-infra/hosts/eval04.ofborg.org/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
services.hydra-queue-builder-v2 = {
4848
enable = true;
4949
queueRunnerAddr = "https://queue-runner.staging-hydra.nixos.org";
50-
maxJobs = 2;
50+
maxJobs = 4;
5151
supportedFeatures = [ "fod-checker" ];
5252
mandatoryFeatures = [ "fod-checker" ];
5353
mtls = {

non-critical-infra/modules/ofborg/common.nix

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,27 @@
55
"${inputs.infra}/modules/common.nix"
66
"${inputs.infra}/non-critical-infra/modules/common.nix"
77
./ofborg-config.nix
8+
"${inputs.nixpkgs-unstable-helsinki}/nixos/modules/services/system/nix-daemon-firewall.nix"
89
];
910

10-
nix.gc.automatic = true;
11+
nix = {
12+
gc.automatic = true;
13+
firewall = {
14+
enable = true;
15+
allowedTCPPorts = [
16+
21 # access to ftp files
17+
22 # fetchGit
18+
34
19+
"http"
20+
443
21+
"30000-31000"
22+
];
23+
allowedUDPPorts = [
24+
53 # DNS
25+
443 # QUIC/HTTP3
26+
];
27+
};
28+
};
1129

1230
# TODO wire up exporters
1331
# TODO loki

0 commit comments

Comments
 (0)