summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/2configs/buildbot-all.nix2
-rw-r--r--krebs/3modules/krebs/default.nix8
-rw-r--r--krebs/3modules/lass/default.nix8
-rw-r--r--krebs/3modules/makefu/default.nix30
-rw-r--r--krebs/3modules/tv/default.nix14
-rw-r--r--lass/3modules/hosts.nix2
-rw-r--r--lib/types.nix5
7 files changed, 35 insertions, 34 deletions
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix
index 7344d9d18..8a647012f 100644
--- a/krebs/2configs/buildbot-all.nix
+++ b/krebs/2configs/buildbot-all.nix
@@ -8,6 +8,6 @@ with import <stockholm/lib>;
networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
krebs.ci.enable = true;
krebs.ci.treeStableTimer = 1;
- krebs.ci.hosts = filter (getAttr "managed") (attrValues config.krebs.hosts);
+ krebs.ci.hosts = filter (getAttr "ci") (attrValues config.krebs.hosts);
}
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix
index 9cd103175..881329a47 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/krebs/3modules/krebs/default.nix
@@ -31,8 +31,8 @@ let
in {
hosts = {
hope = {
+ ci = true;
owner = config.krebs.users.krebs;
- managed = true;
nets = {
internet = {
ip4.addr = "45.62.225.18";
@@ -63,8 +63,8 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdLHRI29xJj1jmfSidE2Dh7EsDNszm+WH3Kj4zYBkP/";
};
hotdog = {
+ ci = true;
owner = config.krebs.users.krebs;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.77.3";
@@ -90,8 +90,8 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxFkBln23wUxt4RhIHE3GvdKeBpJbjn++6maupHqUHp";
};
puyak = {
+ ci = true;
owner = config.krebs.users.krebs;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.77.2";
@@ -117,8 +117,8 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpVwKv9mQGfcn5oFwuitq+b6Dz4jBG9sGhVoCYFw5RY";
};
wolf = {
+ ci = true;
owner = config.krebs.users.krebs;
- managed = true;
nets = {
shack = {
ip4.addr = "10.42.2.150" ;
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 7aeeb1f21..a42a01d24 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
{
hosts = mapAttrs (_: recursiveUpdate {
owner = config.krebs.users.lass;
- managed = true;
+ ci = true;
}) {
dishfire = {
cores = 4;
@@ -126,7 +126,7 @@ with import <stockholm/lib>;
ssh.port = 2223;
};
};
- managed = false;
+ ci = false;
};
uriel = {
cores = 1;
@@ -296,7 +296,7 @@ with import <stockholm/lib>;
};
iso = {
cores = 1;
- managed = false;
+ ci = false;
};
sokrateslaptop = {
nets = {
@@ -318,7 +318,7 @@ with import <stockholm/lib>;
'';
};
};
- managed = false;
+ ci = false;
};
};
users = {
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 21ea7e23c..6e0e876b8 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -5,8 +5,8 @@ with import <stockholm/lib>;
{
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {
drop = rec {
+ ci = true;
cores = 1;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.177.9";
@@ -28,8 +28,8 @@ with import <stockholm/lib>;
};
};
studio = rec {
+ ci = true;
cores = 4;
- managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqBR5gjJkR1TEIs2yx6JRoIOA7+/LJA6kjju8yCauFa studio";
nets = {
@@ -54,8 +54,8 @@ with import <stockholm/lib>;
};
fileleech = rec {
+ ci = true;
cores = 4;
- managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+jB5QdPsAJc90alYDhAEP3sPDJb6eIj9bebj+rTBEJ fileleech";
nets = {
@@ -80,8 +80,8 @@ with import <stockholm/lib>;
};
pnp = {
+ ci = true;
cores = 1;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.0.210";
@@ -104,8 +104,8 @@ with import <stockholm/lib>;
};
};
darth = {
+ ci = true;
cores = 4;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.0.84";
@@ -176,7 +176,7 @@ with import <stockholm/lib>;
};
};
tsp = {
- managed = true;
+ ci = true;
cores = 1;
nets = {
retiolum = {
@@ -204,7 +204,7 @@ with import <stockholm/lib>;
};
};
x = {
- managed = true;
+ ci = true;
cores = 4;
nets = {
retiolum = {
@@ -249,8 +249,8 @@ with import <stockholm/lib>;
};
vbob = {
+ ci = true;
cores = 2;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.1.91";
@@ -312,8 +312,8 @@ with import <stockholm/lib>;
};
};
wry = rec {
+ ci = true;
cores = 1;
- managed = true;
extraZones = {
"krebsco.de" = ''
wry IN A ${nets.internet.ip4.addr}
@@ -357,8 +357,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH4Tjx9qK6uWtxT1HCpeC0XvDZKO/kaPygyKatpAqU6I root@wry";
};
filepimp = rec {
+ ci = true;
cores = 1;
- managed = true;
nets = {
lan = {
ip4.addr = "192.168.1.12";
@@ -387,8 +387,8 @@ with import <stockholm/lib>;
};
omo = rec {
+ ci = true;
cores = 2;
- managed = true;
nets = {
lan = {
@@ -421,8 +421,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBGboU/P00yYiwYje53G0oqDFWmcSJ+hIpMsl4f/HH";
};
wbob = rec {
+ ci = true;
cores = 4;
- managed = true;
nets = {
siem = {
ip4.addr = "10.8.10.7";
@@ -463,8 +463,8 @@ with import <stockholm/lib>;
};
gum = rec {
+ ci = true;
cores = 2;
- managed = true;
extraZones = {
"krebsco.de" = ''
@@ -526,8 +526,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcxWFEPzke/Sdd9qNX6rSJgXal8NmINYajpFCxXfYdj root@gum";
};
shoney = rec {
+ ci = true;
cores = 1;
- managed = true;
nets = rec {
siem = {
via = internet;
@@ -575,8 +575,8 @@ with import <stockholm/lib>;
};
};
sdev = rec {
+ ci = true;
cores = 1;
- managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtm6ETzNgLcXNkrKs2VUEiGsTKBmOFpW2fazbzdUfOg sdev";
nets = {
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 68cba633b..d6e6eae11 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -8,8 +8,8 @@ with import <stockholm/lib>;
};
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.tv) {
alnus = {
+ ci = true;
cores = 2;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.21.1";
@@ -33,6 +33,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP9JS2Nyjx4Pn+/4MrFi1EvBBYVKkGm2Q4lhgaAiSuiGLol53OSsL2KIo01mbcSSBWow9QpQpn8KDoRnT2aMLDrdTFqL20ztDLOXmtrSsz3flgCjmW4f6uOaoZF0RNjAybd1coqwSJ7EINugwoqOsg1zzN2qeIGKYFvqFIKibYFAnQ8hcksmkvPdIO5O8CbdIiP9sZSrSDp0ZyLK2T0PML2jensVZOeqSPulQDFqLsbmavpVLkpDjdzzPRwbZWNB4++YeipbYNOkX4GR1EB4wMZ93IbBV7kpJtib2Zb2AnUf7UW37hxWBjILdstj9ClwNOQggn8kD9ub7YxBzH1dz0Xd8a0mPOAWIDJz9MypXgFRc3vdvPB/W1I4Se0CLbgOkORun9CkgijKr9oEY8JNt8HFd6viZcAaQxOyIm6PNHZTnHfdSc7bIBS2n3e3IZBv0fTd77knGLXg402aTuu2bm/kxsKivxsILXIaGbeXe4ceN3Fynr3FzSM2bUkzHb0mAHu1BQ9YaX0xzCwjVueA5nzGls7ODSFkXsiBfg2FvMN/sTLFca6tnwyqcnD6nujoiS5+BxjDWPgnZYqCaW3B/IkpTsRMsX6QrfhOFcsP8qlJ2Cp82orWoDK/D0vZ9pdzAc6PFGga0RofuJKY2yiq+SRZ7/e9E6VncIVCYZ1OfN0Q==";
};
cd = {
+ ci = true;
cores = 2;
extraZones = {
# TODO generate krebsco.de zone from nets and don't use extraZones at all
@@ -40,7 +41,6 @@ with import <stockholm/lib>;
cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
'';
};
- managed = true;
nets = {
internet = {
ip4.addr = "45.62.237.203";
@@ -135,8 +135,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5Wr36T0MmB8pnSO5/pw9/Dfe5+IMgVHOhm6EUa55jj";
};
mu = {
+ ci = true;
cores = 2;
- managed = true;
nets = {
retiolum = {
ip4.addr = "10.243.20.1";
@@ -205,8 +205,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb";
};
nomic = {
+ ci = true;
cores = 2;
- managed = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.110";
@@ -261,8 +261,8 @@ with import <stockholm/lib>;
};
};
wu = {
+ ci = true;
cores = 4;
- managed = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.37";
@@ -299,8 +299,8 @@ with import <stockholm/lib>;
binary-cache = {
pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s=";
};
+ ci = true;
cores = 4;
- managed = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.38";
@@ -335,8 +335,8 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnjfceKuHNQu7S4eYFN1FqgzMqiL7haNZMh2ZLhvuhK root@xu";
};
zu = {
+ ci = true;
cores = 4;
- managed = true;
nets = {
gg23 = {
ip4.addr = "10.23.1.39";
diff --git a/lass/3modules/hosts.nix b/lass/3modules/hosts.nix
index 7e3af10be..37cbf3ed3 100644
--- a/lass/3modules/hosts.nix
+++ b/lass/3modules/hosts.nix
@@ -6,7 +6,7 @@ with import <stockholm/lib>;
options.lass.hosts = mkOption {
type = types.attrsOf types.host;
default =
- filterAttrs (_: host: host.owner.name == "lass" && host.managed)
+ filterAttrs (_: host: host.owner.name == "lass" && host.ci)
config.krebs.hosts;
};
}
diff --git a/lib/types.nix b/lib/types.nix
index 8c6846887..a9563ccc5 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -31,9 +31,10 @@ rec {
default = null;
};
- managed = mkOption {
+ ci = mkOption {
description = ''
- If true, then the host's configuration is defined in stockholm.
+ If true, then the host wants to be tested by some CI system.
+ See <stockholm/krebs/2configs/buildbot-all.nix>
'';
type = bool;
default = false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 07:33:03 +0000