This commit is contained in:
tv 2016-10-22 00:47:55 +02:00
parent 0d4d8ccf3f
commit b15eda79df
3 changed files with 1 additions and 42 deletions

View File

@ -162,46 +162,6 @@ with import <stockholm/lib>;
};
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu";
};
ire = {
extraZones = {
# TODO generate krebsco.de zone from nets and don't use extraZones at all
"krebsco.de" = ''
ire 60 IN A ${config.krebs.hosts.ire.nets.internet.ip4.addr}
'';
};
nets = {
internet = {
ip4.addr = "198.147.22.115";
aliases = [
"ire.i"
"ire.internet"
"ire.krebsco.de"
];
ssh.port = 11423;
};
retiolum = {
via = config.krebs.hosts.ire.nets.internet;
ip4.addr = "10.243.231.66";
ip6.addr = "42:b912:0f42:a82d:0d27:8610:e89b:490c";
aliases = [
"ire.r"
"ire.retiolum"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAwofjmP/XBf5pwsJlWklkSzI+Bo0I0B9ONc7/j+zpbmMRkwbWk4X7
rVLt1cWvTY15ujg2u8l0o6OgEbIkc6rslkD603fv1sEAd0KOv7iKLgRpE9qfSvAt
6YpiSv+mxEMTpH0g36OmBfOJ10uT+iHDB/FfxmgGJx//jdJADzLjjWC6ID+iGkGU
1Sf+yHXF7HRmQ29Yak8LYVCJpGC5bQfWIMSL5lujLq4NchY2d+NZDkuvh42Ayr0K
LPflnPBQ3XnKHKtSsnFR2vaP6q+d3Opsq/kzBnAkjL26jEuFK1v7P/HhNhJoPzwu
nKKWj/W/k448ce374k5ycjvKm0c6baAC/wIDAQAB
-----END RSA PUBLIC KEY-----
'';
ssh.port = 11423;
};
};
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaMjBJ/BfYlHjyn5CO0xzFNaQ0LPvMP3W9UlOs1OxGY";
};
kaepsele = {
nets = {
internet = {

View File

@ -40,7 +40,7 @@ in {
'';
connectTo = [
"muhbaasu" "tahoe" "flap" "wry"
"ire" "cd" "mkdir" "rmdir"
"cd"
"fastpoke" "prism" "dishfire" "echelon" "cloudkrebs"
];
};

View File

@ -10,7 +10,6 @@ with import <stockholm/lib>;
"prism"
"echelon"
"cd"
"ire"
];
tincPackage = pkgs.tinc_pre;
};