summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-08-13 17:09:56 +0200
committertv <tv@shackspace.de>2015-08-13 17:09:56 +0200
commita33f90358d0f57025daddb0ae41d65707fb34cf3 (patch)
tree7f91c889c45fd8995af98d91b0670fb0e90b1d53 /krebs/3modules
parent9f92ba455c4b13f4d960bae65cd577c9aad30dc4 (diff)
parent4366ffd6c5d401e3719a588f5ac98365aef8bd89 (diff)
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix43
1 files changed, 40 insertions, 3 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index fd795a036..467cc4459 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -165,7 +165,7 @@ let
{ krebs = tv-imp; }
{
krebs.dns.providers = {
- de.krebsco = "ovh";
+ de.krebsco = "zones";
internet = "hosts";
retiolum = "hosts";
};
@@ -308,11 +308,11 @@ let
};
};
tsp = {
- cores = 4;
+ cores = 2;
dc = "makefu"; #x200
nets = {
retiolum = {
- addrs4 = ["10.243.0.211"];
+ addrs4 = ["10.243.0.212"];
addrs6 = ["42:f9f1:0000:0000:0000:0000:0000:0002"];
aliases = [
"tsp.retiolum"
@@ -335,6 +335,43 @@ let
};
};
};
+ pigstarter = {
+ cores = 1;
+ dc = "makefu"; #x200
+ nets = {
+ internet = {
+ addrs4 = ["192.40.56.122"];
+ addrs6 = ["2604:2880::841f:72c"];
+ aliases = [
+ "pigstarter.internet"
+ ];
+ zones = [
+ { "pigstarter.krebsco.de" = "A";}
+ { "io.krebsco.de" = "NS";}
+ { "io.krebsco.de" = "A";}
+ { "mx42.krebsco.de" = "MX";}
+ { "mx42.krebsco.de" = "A";}
+ ];
+ };
+ retiolum = {
+ addrs4 = ["10.243.0.153"];
+ addrs6 = ["42:9143:b4c0:f981:6030:7aa2:8bc5:4110"];
+ aliases = [
+ "pigstarter.retiolum"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEA/efJuJRLUIZROe3QE8WYTD/zyNGRh9I2/yw+5It9HSNVDMIOV1FZ
+ 9PaspsC+YQSBUQRN8SJ95G4RM6TIn/+ei7LiUYsf1Ik+uEOpP5EPthXqvdJEeswv
+ 3QFwbpBeOMNdvmGvQLeR1uJKVyf39iep1wWGOSO1sLtUA+skUuN38QKc1BPASzFG
+ 4ATM6rd2Tkt8+9hCeoePJdLr3pXat9BBuQIxImgx7m5EP02SH1ndb2wttQeAi9cE
+ DdJadpzOcEgFatzXP3SoKVV9loRHz5HhV4WtAqBIkDvgjj2j+NnXolAUY25Ix+kv
+ sfqfIw5aNLoIX4kDhuDEVBIyoc7/ofSbkQIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+ };
+ };
};
users = addNames {
makefu = {