Skip to content

Commit

Permalink
Separate machine specific x86 builder configuration from the common one
Browse files Browse the repository at this point in the history
Changes:
- adds build3 (x86 builder on Ficolo) specific configuration
- adds Barna as a trusted user to build3 specific configuration
- hostname of build3 machine changed from "nixos" to "build3"

Notes:
- Hostname change will not take place without running the hostname tool
  or without reboot

Signed-off-by: Marko Kaapu <[email protected]>
  • Loading branch information
mkaapu committed Jan 23, 2024
1 parent 1103463 commit 05dcc27
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 10 deletions.
4 changes: 2 additions & 2 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
inherit specialArgs;
modules = [./monitoring/configuration.nix];
};
ficolobuild = lib.nixosSystem {
ficolobuild3 = lib.nixosSystem {
inherit specialArgs;
modules = [./ficolobuild/configuration.nix];
modules = [./ficolobuild/build3.nix];
};
prbuilder = lib.nixosSystem {
inherit specialArgs;
Expand Down
25 changes: 25 additions & 0 deletions hosts/ficolobuild/build3.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
# SPDX-License-Identifier: Apache-2.0
#
{
self,
lib,
...
}: {
imports = lib.flatten [
(with self.nixosModules; [
user-themisto
user-barna
])
./builder.nix
];

# build3 specific configuration

networking.hostName = "build3";

# Trust Themisto Hydra user
nix.settings = {
trusted-users = ["root" "themisto" "barna"];
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
user-hrosten
user-jrautiola
user-mkaapu
user-themisto
user-tervis
user-karim
user-mika
Expand All @@ -42,9 +41,4 @@
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

# Trust Themisto Hydra user
nix.settings = {
trusted-users = ["root" "themisto"];
};
}
4 changes: 2 additions & 2 deletions tasks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
# SPDX-FileCopyrightText: 2023 Nix community projects
#
# SPDX-License-Identifier: MIT
Expand Down Expand Up @@ -86,7 +86,7 @@ class TargetHost:
),
"build3-ficolo": TargetHost(
hostname="172.18.20.104",
nixosconfig="ficolobuild",
nixosconfig="ficolobuild3",
),
"prbuilder": TargetHost(
hostname="172.18.20.106",
Expand Down

0 comments on commit 05dcc27

Please sign in to comment.