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

krebs: rm types.host.dc

Browse Source
This commit is contained in:
tv 2016-02-08 03:21:01 +01:00
parent 356bb8e0d3
commit 7a9f130c12
6 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/3modules/lass/default.nix
View File

@ -6,7 +6,6 @@ with lib;
hosts = { hosts = {
echelon = { echelon = {
cores = 2; cores = 2;
dc = "lass"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["162.252.241.33"]; addrs4 = ["162.252.241.33"];
@ -40,7 +39,6 @@ with lib;
}; };
prism = { prism = {
cores = 4; cores = 4;
dc = "lass"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["213.239.205.240"]; addrs4 = ["213.239.205.240"];
@ -72,7 +70,6 @@ with lib;
ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChm4sqQ2bUZj+2YnTf6G5HHRTpSe1jTUhJRnwcYPYZKF+CBqBncipRpuGlGXEsptNa+7ZMcQC0ySsz5SUOMt3Ih+NehVe/qt3VtRz0l0MgOWmH2qBwKK9Y4IuxrJQzUmP4UGlOGlFj9DORssSMOyFIG4eZ9k2qMn3xal0NVRfGTShKlouWsiUILZ8I+sDNE00z8DAYesgc1yazvRnjzvLkRxdNdpYiAFBbmXMpPKK95McRJaWsuNSeal9kd5p5PagWcgN4DZ6+ebzz3NKnmzk4j+vuHX0U9lTXBqKMlzzmM2YNLRtDPfrtJNyHqLpZUpFhJKqZCD+4/0zdrzRfC7Th+5czzUCSvHiKPVsqw5eOdiQX6EyzNAF5zpkpRp//QdUNNXC5/Ku6GKCO491+TuA8VCha0fOwBONccTLUI/hGNmCh88mLbukVoeGJrbYNCOA/6kEz7ZLEveU4i+TT7okhDElMsNk+AWCZ8/NdJQNX3/K6+JJ9qAn+/yC8LdjgYYJ2oU/aw5/HyOgiQ0z4n9UfQ7j+nHysY9CQb1b3guX7yjJoc3KpNXCXEztuIRHjFD1EP8NRTSmGjsa/VjLmTLSsqjD+7IE5mT0tO5RJvmagDgdJSr/iR5D9zjW7hx7ttvektrlp9g0v3CiCFVaW4l95hGYT0HaNBLJ5R0YHm0lD+Q=="; ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChm4sqQ2bUZj+2YnTf6G5HHRTpSe1jTUhJRnwcYPYZKF+CBqBncipRpuGlGXEsptNa+7ZMcQC0ySsz5SUOMt3Ih+NehVe/qt3VtRz0l0MgOWmH2qBwKK9Y4IuxrJQzUmP4UGlOGlFj9DORssSMOyFIG4eZ9k2qMn3xal0NVRfGTShKlouWsiUILZ8I+sDNE00z8DAYesgc1yazvRnjzvLkRxdNdpYiAFBbmXMpPKK95McRJaWsuNSeal9kd5p5PagWcgN4DZ6+ebzz3NKnmzk4j+vuHX0U9lTXBqKMlzzmM2YNLRtDPfrtJNyHqLpZUpFhJKqZCD+4/0zdrzRfC7Th+5czzUCSvHiKPVsqw5eOdiQX6EyzNAF5zpkpRp//QdUNNXC5/Ku6GKCO491+TuA8VCha0fOwBONccTLUI/hGNmCh88mLbukVoeGJrbYNCOA/6kEz7ZLEveU4i+TT7okhDElMsNk+AWCZ8/NdJQNX3/K6+JJ9qAn+/yC8LdjgYYJ2oU/aw5/HyOgiQ0z4n9UfQ7j+nHysY9CQb1b3guX7yjJoc3KpNXCXEztuIRHjFD1EP8NRTSmGjsa/VjLmTLSsqjD+7IE5mT0tO5RJvmagDgdJSr/iR5D9zjW7hx7ttvektrlp9g0v3CiCFVaW4l95hGYT0HaNBLJ5R0YHm0lD+Q==";
}; };
fastpoke = { fastpoke = {
dc = "lass";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["193.22.164.36"]; addrs4 = ["193.22.164.36"];
@ -103,7 +100,6 @@ with lib;
}; };
cloudkrebs = { cloudkrebs = {
cores = 1; cores = 1;
dc = "lass"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["104.167.113.104"]; addrs4 = ["104.167.113.104"];
@ -136,7 +132,6 @@ with lib;
}; };
uriel = { uriel = {
cores = 1; cores = 1;
dc = "lass";
nets = { nets = {
gg23 = { gg23 = {
addrs4 = ["10.23.1.12"]; addrs4 = ["10.23.1.12"];
@ -167,7 +162,6 @@ with lib;
}; };
mors = { mors = {
cores = 2; cores = 2;
dc = "lass";
nets = { nets = {
gg23 = { gg23 = {
addrs4 = ["10.23.1.11"]; addrs4 = ["10.23.1.11"];

11
krebs/3modules/makefu/default.nix
View File

@ -6,7 +6,6 @@ with lib;
hosts = { hosts = {
pnp = { pnp = {
cores = 1; cores = 1;
dc = "makefu"; #vm on 'omo'
nets = { nets = {
retiolum = { retiolum = {
addrs4 = ["10.243.0.210"]; addrs4 = ["10.243.0.210"];
@ -30,7 +29,6 @@ with lib;
}; };
tsp = { tsp = {
cores = 1; cores = 1;
dc = "makefu"; #x200
nets = { nets = {
retiolum = { retiolum = {
addrs4 = ["10.243.0.212"]; addrs4 = ["10.243.0.212"];
@ -58,7 +56,6 @@ with lib;
}; };
pornocauster = { pornocauster = {
cores = 2; cores = 2;
dc = "makefu"; #x220
nets = { nets = {
retiolum = { retiolum = {
addrs4 = ["10.243.0.91"]; addrs4 = ["10.243.0.91"];
@ -90,7 +87,6 @@ with lib;
vbob = { vbob = {
cores = 2; cores = 2;
dc = "makefu"; #vm local
nets = { nets = {
retiolum = { retiolum = {
addrs4 = ["10.243.1.91"]; addrs4 = ["10.243.1.91"];
@ -116,7 +112,6 @@ with lib;
}; };
flap = rec { flap = rec {
cores = 1; cores = 1;
dc = "cac"; #vps
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
@ -152,7 +147,6 @@ with lib;
}; };
pigstarter = rec { pigstarter = rec {
cores = 1; cores = 1;
dc = "frontrange"; #vps
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
@ -191,7 +185,6 @@ with lib;
}; };
wry = rec { wry = rec {
cores = 1; cores = 1;
dc = "makefu"; #dc = "cac";
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
euer IN A ${head nets.internet.addrs4} euer IN A ${head nets.internet.addrs4}
@ -248,7 +241,6 @@ with lib;
}; };
filepimp = rec { filepimp = rec {
cores = 1; cores = 1;
dc = "makefu"; #nas
nets = { nets = {
retiolum = { retiolum = {
@ -273,7 +265,6 @@ with lib;
omo = rec { omo = rec {
cores = 2; cores = 2;
dc = "makefu"; #AMD E350
nets = { nets = {
retiolum = { retiolum = {
@ -299,7 +290,6 @@ with lib;
}; };
wbob = rec { wbob = rec {
cores = 1; cores = 1;
dc = "none";
nets = { nets = {
retiolm = { retiolm = {
addrs4 = ["10.243.214.15/32"]; addrs4 = ["10.243.214.15/32"];
@ -323,7 +313,6 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
gum = rec { gum = rec {
cores = 1; cores = 1;
dc = "online.net"; #root-server
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''

1
krebs/3modules/mv/default.nix
View File

@ -6,7 +6,6 @@ with lib;
hosts = { hosts = {
stro = { stro = {
cores = 4; cores = 4;
dc = "mv";
nets = { nets = {
retiolum = { retiolum = {
addrs4 = ["10.243.111.111"]; addrs4 = ["10.243.111.111"];

1
krebs/3modules/shared/default.nix
View File

@ -34,7 +34,6 @@ let
in { in {
hosts = { hosts = {
wolf = { wolf = {
dc = "shack";
nets = { nets = {
shack = { shack = {
addrs4 = [ "10.42.2.150" ]; addrs4 = [ "10.42.2.150" ];

8
krebs/3modules/tv/default.nix
View File

@ -9,7 +9,6 @@ with lib;
hosts = { hosts = {
cd = rec { cd = rec {
cores = 2; cores = 2;
dc = "tv"; #dc = "cac";
extraZones = { extraZones = {
# TODO generate krebsco.de zone from nets and don't use extraZones at all # TODO generate krebsco.de zone from nets and don't use extraZones at all
"krebsco.de" = '' "krebsco.de" = ''
@ -65,7 +64,6 @@ with lib;
}; };
mkdir = rec { mkdir = rec {
cores = 1; cores = 1;
dc = "tv"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["104.167.114.142"]; addrs4 = ["104.167.114.142"];
@ -193,7 +191,6 @@ with lib;
}; };
nomic = { nomic = {
cores = 2; cores = 2;
dc = "tv"; #dc = "gg23";
nets = rec { nets = rec {
gg23 = { gg23 = {
addrs4 = ["10.23.1.110"]; addrs4 = ["10.23.1.110"];
@ -235,7 +232,6 @@ with lib;
}; };
rmdir = rec { rmdir = rec {
cores = 1; cores = 1;
dc = "tv"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["167.88.34.182"]; addrs4 = ["167.88.34.182"];
@ -287,8 +283,6 @@ with lib;
}; };
wu = { wu = {
cores = 4; cores = 4;
# TODO wu is mobile, so dc means "home data center"
dc = "tv"; #dc = "gg23";
nets = { nets = {
gg23 = { gg23 = {
addrs4 = ["10.23.1.37"]; addrs4 = ["10.23.1.37"];
@ -322,8 +316,6 @@ with lib;
}; };
xu = { xu = {
cores = 4; cores = 4;
# TODO xu is mobile, so dc means "home data center"
dc = "tv"; #dc = "gg23";
nets = { nets = {
gg23 = { gg23 = {
addrs4 = ["10.23.1.38"]; addrs4 = ["10.23.1.38"];

3
krebs/4lib/types.nix
View File

@ -12,9 +12,6 @@ types // rec {
type = label; type = label;
default = config._module.args.name; default = config._module.args.name;
}; };
dc = mkOption {
type = label;
};
cores = mkOption { cores = mkOption {
type = positive; type = positive;
}; };