types host: remove cores

This commit is contained in:
lassulus 2022-12-27 12:20:42 +01:00
parent 5a361e638f
commit ea9dbc8caf
28 changed files with 0 additions and 61 deletions

View File

@ -15,7 +15,6 @@ with import ../../lib;
"test-all-krebs-modules" "test-all-krebs-modules"
] (name: { ] (name: {
inherit name; inherit name;
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.73.57"; ip4.addr = "10.243.73.57";
@ -36,7 +35,6 @@ in {
hosts = mapAttrs hostDefaults ({ hosts = mapAttrs hostDefaults ({
filebitch = { filebitch = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
shack = { shack = {
ip4 = { ip4 = {
@ -134,7 +132,6 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl5cDF9QheXyMlNYIX17ILbgd94K50fZy7w0fDLvZlo "; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl5cDF9QheXyMlNYIX17ILbgd94K50fZy7w0fDLvZlo ";
}; };
onebutton = { onebutton = {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.101"; ip4.addr = "10.243.0.101";
@ -163,7 +160,6 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcZg+iLaPZ0SpLM+nANxIjZC/RIsansjyutK0+gPhIe "; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcZg+iLaPZ0SpLM+nANxIjZC/RIsansjyutK0+gPhIe ";
}; };
ponte = { ponte = {
cores = 1;
owner = config.krebs.users.krebs; owner = config.krebs.users.krebs;
extraZones = { extraZones = {
"krebsco.de" = /* bindzone */ '' "krebsco.de" = /* bindzone */ ''
@ -212,7 +208,6 @@ in {
}; };
puyak = { puyak = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.77.2"; ip4.addr = "10.243.77.2";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.77"; ip4.addr = "10.243.0.77";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 16;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.17"; ip4.addr = "10.243.0.17";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.133.115"; ip4.addr = "10.243.133.115";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 4;
nets = rec { nets = rec {
internet = { internet = {
ip4 = rec { ip4 = rec {

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.3"; ip4.addr = "10.243.0.3";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.66"; ip4.addr = "10.243.0.66";

View File

@ -1,7 +1,6 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
consul = false; consul = false;
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.20.123"; ip4.addr = "10.243.20.123";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.133.114"; ip4.addr = "10.243.133.114";

View File

@ -1,7 +1,6 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
consul = false; consul = false;
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.1.89"; ip4.addr = "10.243.1.89";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.133.77"; ip4.addr = "10.243.133.77";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
ci = false; ci = false;
nets = { nets = {
retiolum = { retiolum = {

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.2"; ip4.addr = "10.243.0.2";

View File

@ -1,6 +1,5 @@
{ config, krebs, r6, w6, ... }: { config, krebs, r6, w6, ... }:
rec { rec {
cores = 4;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
cache 60 IN A ${nets.internet.ip4.addr} cache 60 IN A ${nets.internet.ip4.addr}

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.4"; ip4.addr = "10.243.0.4";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.133.116"; ip4.addr = "10.243.133.116";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.11.1"; ip4.addr = "10.243.11.1";

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 2;
consul = false; consul = false;
nets = rec { nets = rec {
retiolum = { retiolum = {

View File

@ -1,6 +1,5 @@
{ r6, w6, ... }: { r6, w6, ... }:
{ {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.14"; ip4.addr = "10.243.0.14";

View File

@ -58,21 +58,18 @@ with import ../../lib;
in { in {
hosts = mapAttrs hostDefaults { hosts = mapAttrs hostDefaults {
cake = rec { cake = rec {
cores = 4;
ci = false; ci = false;
nets = { nets = {
retiolum.ip4.addr = "10.243.136.236"; retiolum.ip4.addr = "10.243.136.236";
}; };
}; };
crapi = rec { # raspi1 crapi = rec { # raspi1
cores = 1;
ci = false; ci = false;
nets = { nets = {
retiolum.ip4.addr = "10.243.136.237"; retiolum.ip4.addr = "10.243.136.237";
}; };
}; };
firecracker = { firecracker = {
cores = 4;
nets = { nets = {
retiolum.ip4.addr = "10.243.12.12"; retiolum.ip4.addr = "10.243.12.12";
}; };
@ -80,28 +77,24 @@ in {
studio = rec { studio = rec {
ci = false; ci = false;
cores = 4;
nets = { nets = {
retiolum.ip4.addr = "10.243.227.163"; retiolum.ip4.addr = "10.243.227.163";
}; };
}; };
fileleech = rec { fileleech = rec {
ci = false; ci = false;
cores = 4;
nets = { nets = {
retiolum.ip4.addr = "10.243.113.98"; retiolum.ip4.addr = "10.243.113.98";
}; };
}; };
tsp = { tsp = {
ci = true; ci = true;
cores = 1;
nets = { nets = {
retiolum.ip4.addr = "10.243.0.212"; retiolum.ip4.addr = "10.243.0.212";
}; };
}; };
x = { x = {
ci = true; ci = true;
cores = 4;
syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5"; syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5";
nets = { nets = {
retiolum.ip4.addr = "10.243.0.91"; retiolum.ip4.addr = "10.243.0.91";
@ -113,7 +106,6 @@ in {
}; };
filepimp = rec { filepimp = rec {
ci = false; ci = false;
cores = 1;
nets = { nets = {
retiolum.ip4.addr = "10.243.153.102"; retiolum.ip4.addr = "10.243.153.102";
}; };
@ -121,7 +113,6 @@ in {
omo = rec { omo = rec {
ci = true; ci = true;
cores = 2;
syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK"; syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK";
nets = { nets = {
retiolum = { retiolum = {
@ -139,7 +130,6 @@ in {
}; };
wbob = rec { wbob = rec {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.214.15"; ip4.addr = "10.243.214.15";
@ -164,7 +154,6 @@ in {
latte.euer IN A ${nets.internet.ip4.addr} latte.euer IN A ${nets.internet.ip4.addr}
''; '';
}; };
cores = 4;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "178.254.30.202"; ip4.addr = "178.254.30.202";
@ -246,7 +235,6 @@ in {
music.euer IN A ${nets.internet.ip4.addr} music.euer IN A ${nets.internet.ip4.addr}
''; '';
}; };
cores = 8;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "142.132.189.140"; ip4.addr = "142.132.189.140";
@ -302,7 +290,6 @@ in {
sdev = rec { sdev = rec {
ci = true; ci = true;
cores = 1;
nets = { nets = {
retiolum.ip4.addr = "10.243.83.237"; retiolum.ip4.addr = "10.243.83.237";
}; };
@ -312,7 +299,6 @@ in {
# non-stockholm # non-stockholm
flap = rec { flap = rec {
cores = 1;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
flap IN A ${nets.internet.ip4.addr} flap IN A ${nets.internet.ip4.addr}
@ -332,7 +318,6 @@ in {
}; };
nukular = rec { nukular = rec {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.231.219"; ip4.addr = "10.243.231.219";
@ -342,17 +327,14 @@ in {
shackdev = rec { # router@shack shackdev = rec { # router@shack
cores = 1;
nets.wiregrill.ip4.addr = "10.244.245.2"; nets.wiregrill.ip4.addr = "10.244.245.2";
}; };
rockit = rec { # router@home rockit = rec { # router@home
cores = 1;
nets.wiregrill.ip4.addr = "10.244.245.3"; nets.wiregrill.ip4.addr = "10.244.245.3";
}; };
senderechner = rec { senderechner = rec {
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.163"; ip4.addr = "10.243.0.163";

View File

@ -43,7 +43,6 @@ in {
}; };
}; };
horisa = { horisa = {
cores = 2;
owner = config.krebs.users.ulrich; # main laptop owner = config.krebs.users.ulrich; # main laptop
nets = { nets = {
retiolum = { retiolum = {
@ -57,7 +56,6 @@ in {
}; };
}; };
hasegateway = { hasegateway = {
cores = 1;
owner = config.krebs.users.hase; owner = config.krebs.users.hase;
nets = { nets = {
#internet = { #internet = {
@ -343,7 +341,6 @@ in {
}; };
}; };
tpsw = { tpsw = {
cores = 2;
owner = config.krebs.users.ciko; # main laptop owner = config.krebs.users.ciko; # main laptop
nets = { nets = {
retiolum = { retiolum = {

View File

@ -40,7 +40,6 @@ in {
hosts = mapAttrs evalHost { hosts = mapAttrs evalHost {
alnus = { alnus = {
ci = true; ci = true;
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.21.1"; ip4.addr = "10.243.21.1";
@ -64,7 +63,6 @@ in {
}; };
au = { au = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.13.39"; ip4.addr = "10.243.13.39";
@ -89,7 +87,6 @@ in {
}; };
bu = { bu = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.13.36"; ip4.addr = "10.243.13.36";
@ -138,7 +135,6 @@ in {
}; };
mu = { mu = {
ci = true; ci = true;
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.20.1"; ip4.addr = "10.243.20.1";
@ -230,7 +226,6 @@ in {
}; };
nomic = { nomic = {
ci = true; ci = true;
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.110"; ip4.addr = "10.243.0.110";
@ -256,7 +251,6 @@ in {
}; };
wu = { wu = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.13.37"; ip4.addr = "10.243.13.37";
@ -282,7 +276,6 @@ in {
}; };
querel = { querel = {
ci = true; ci = true;
cores = 2;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.22.22"; ip4.addr = "10.243.22.22";
@ -313,7 +306,6 @@ in {
pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s="; pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s=";
}; };
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.13.38"; ip4.addr = "10.243.13.38";
@ -339,7 +331,6 @@ in {
}; };
zu = { zu = {
ci = true; ci = true;
cores = 4;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.13.40"; ip4.addr = "10.243.13.40";

View File

@ -8,7 +8,6 @@
]; ];
krebs.hosts.minimal = { krebs.hosts.minimal = {
cores = 1;
secure = false; secure = false;
}; };

View File

@ -23,7 +23,6 @@ pkgs.writers.writeDashBin "generate-secrets" ''
cat <<EOF cat <<EOF
$HOSTNAME = { $HOSTNAME = {
cores = 1;
owner = config.krebs.users.krebs; owner = config.krebs.users.krebs;
nets = { nets = {
retiolum = { retiolum = {

View File

@ -69,7 +69,6 @@ with import <stockholm/lib>;
]; ];
networking.hostName = config.krebs.build.host.name; networking.hostName = config.krebs.build.host.name;
nix.maxJobs = config.krebs.build.host.cores;
krebs = { krebs = {
enable = true; enable = true;

View File

@ -25,7 +25,6 @@ pkgs.writeDashBin "l-gen-secrets" ''
cat <<EOF cat <<EOF
$HOSTNAME = { $HOSTNAME = {
cores = 1;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.changeme"; ip4.addr = "10.243.0.changeme";

View File

@ -18,9 +18,6 @@ rec {
type = label; type = label;
default = config._module.args.name; default = config._module.args.name;
}; };
cores = mkOption {
type = uint;
};
nets = mkOption { nets = mkOption {
type = attrsOf net; type = attrsOf net;
default = {}; default = {};

View File

@ -23,7 +23,6 @@ pkgs.writeDashBin "generate-secrets" ''
cat <<EOF cat <<EOF
$HOSTNAME = { $HOSTNAME = {
cores = 1;
owner = config.krebs.users.makefu; owner = config.krebs.users.makefu;
nets = { nets = {
retiolum = { retiolum = {