summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-09-05 12:18:02 +0200
committerlassulus <lass@aidsballs.de>2015-09-05 12:18:02 +0200
commit95d3ccbc3dd4b31bc04ac14dbfe3ddfbc96d3649 (patch)
tree4a8609425ef0016ddd4a4aa6c5f6b34e65816d5b /krebs/3modules
parentf54a0a9ea7fd5a9902a5b38786da42f06d615b5a (diff)
parent66a2f7a231599ffc182bcf6a5b4ccf24548861f3 (diff)
Merge branch 'tv'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix25
1 files changed, 25 insertions, 0 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index c683d406c..a6b5a1906 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -712,6 +712,31 @@ let
};
secure = true;
};
+ xu = {
+ cores = 4;
+ # TODO xu is mobile, so dc means "home data center"
+ dc = "tv"; #dc = "gg23";
+ nets = {
+ retiolum = {
+ addrs4 = ["10.243.13.38"];
+ addrs6 = ["42:0:0:0:0:0:0:1338"];
+ aliases = [
+ "xu.retiolum"
+ ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEAl3l7IWbfbkVgaJFM3s9g2UCh2rmqoTba16Of7NNWMj05L/hIkUsQ
+ uc43/QzidWh/4gEaq5MQ7JpLyzVBQYRJkNlPRF/Z07KdLBskAZCjDYdYue9BrziX
+ 8s2Irs2+FNbCK2LqtrPhbcXQJvixsk6vjl2OBpWTDUcDEsk+D1YQilxdtyUzCUkw
+ mmRo/mzNsLZsYlSgZ6El/ZLkRdtexAzGxJ0DrukpDR0uqXXkp7jUaxRCZ+Cwanvj
+ 4I1Hu5aHzWB7KJ1SIvpX3a4f+mun1gh3TPqWP5PUqJok1PSuScz6P2UGaLZZyH63
+ 4o+9nGJPuzb9bpMVRaVGtKXd39jwY7mbqwIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+ };
+ secure = true;
+ };
};
users = addNames {
mv = {