From b82fd9ba290c988e03e34c51fc3b1976be11739d Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 4 Sep 2015 01:29:32 +0200
Subject: krebs tv hosts: add xu

---
 krebs/3modules/default.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 140045b9..077a0e06 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -683,6 +683,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 = {
-- 
cgit v1.2.3


From c2c528926cb0fcf25a2ae4ca718e3ada89afcada Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 4 Sep 2015 01:51:40 +0200
Subject: krebs types net.tinc: s/apply/default/

---
 krebs/4lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 4e123e72..f6b4bd8b 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -67,7 +67,7 @@ types // rec {
           options = {
             config = mkOption {
               type = str;
-              apply = _: ''
+              default = ''
                 ${optionalString (net-config.via != null)
                   (concatMapStringsSep "\n" (a: "Address = ${a}") net-config.via.addrs)}
                 ${concatMapStringsSep "\n" (a: "Subnet = ${a}") net-config.addrs}
-- 
cgit v1.2.3


From 66a2f7a231599ffc182bcf6a5b4ccf24548861f3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 4 Sep 2015 01:52:50 +0200
Subject: krebs Zhosts: add xu

---
 krebs/Zhosts/xu | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 krebs/Zhosts/xu

(limited to 'krebs')

diff --git a/krebs/Zhosts/xu b/krebs/Zhosts/xu
new file mode 100644
index 00000000..688e4a34
--- /dev/null
+++ b/krebs/Zhosts/xu
@@ -0,0 +1,13 @@
+
+Subnet = 10.243.13.38
+Subnet = 42:0:0:0:0:0:0:1338
+-----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-----
+
+
-- 
cgit v1.2.3