Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

types host: remove cores

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kartei/krebs/default.nix
View File

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

1
kartei/lass/blue.nix
View File

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

1
kartei/lass/coaxmetal.nix
View File

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

1
kartei/lass/daedalus.nix
View File

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

1
kartei/lass/dishfire.nix
View File

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

1
kartei/lass/echelon.nix
View File

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

1
kartei/lass/green.nix
View File

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

1
kartei/lass/hilum.nix
View File

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

1
kartei/lass/icarus.nix
View File

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

1
kartei/lass/lasspi.nix
View File

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

1
kartei/lass/littleT.nix
View File

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

1
kartei/lass/massulus.nix
View File

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

1
kartei/lass/mors.nix
View File

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

1
kartei/lass/prism.nix
View File

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

1
kartei/lass/shodan.nix
View File

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

1
kartei/lass/skynet.nix
View File

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

1
kartei/lass/styx.nix
View File

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

1
kartei/lass/xerxes.nix
View File

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

1
kartei/lass/yellow.nix
View File

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

18
kartei/makefu/default.nix
View File

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

3
kartei/others/default.nix
View File

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

9
kartei/tv/default.nix
View File

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

1
krebs/0tests/data/test-config.nix
View File

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

1
krebs/5pkgs/simple/generate-secrets/default.nix
View File

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

1
lass/2configs/default.nix
View File

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

1
lass/5pkgs/l-gen-secrets/default.nix
View File

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

3
lib/types.nix
View File

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

1
makefu/2configs/tools/init-host/default.nix
View File

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