From 2499c472a08783d1cc1105c9b4c48b04f8062b5b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Aug 2015 16:55:10 +0200
Subject: fix ip of tsp (211 is already in use)

---
 krebs/3modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/default.nix')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e677ba5ea..4644e59eb 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -311,7 +311,7 @@ let
         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"
-- 
cgit v1.2.3


From 0862e949f6b736c76b601acd3b17262521175c31 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Wed, 12 Aug 2015 16:58:21 +0200
Subject: tsp: 2 cores

---
 krebs/3modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/default.nix')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 4644e59eb..a533fcf64 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -307,7 +307,7 @@ let
         };
       };
       tsp = {
-        cores = 4;
+        cores = 2;
         dc = "makefu"; #x200
         nets = {
           retiolum = {
-- 
cgit v1.2.3


From 7c578b1cad5d33c4a2773459ef62a8a72c585972 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 13 Aug 2015 11:46:09 +0200
Subject: {tv 2 => krebs 3}/exim-retiolum

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

(limited to 'krebs/3modules/default.nix')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e677ba5ea..fd795a036 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -6,6 +6,7 @@ let
 
   out = {
     imports = [
+      ./exim-retiolum.nix
       ./github-hosts-sync.nix
       ./git.nix
       ./nginx.nix
-- 
cgit v1.2.3


From ab2d3f96be09e4a77f33b7ce2f3b96dbc9b57c39 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Thu, 13 Aug 2015 12:02:26 +0200
Subject: services: add pigstarter

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

(limited to 'krebs/3modules/default.nix')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index a533fcf64..8573c5a05 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -164,7 +164,7 @@ let
     { krebs = tv-imp; }
     {
       krebs.dns.providers = {
-        de.krebsco = "ovh";
+        de.krebsco = "zones";
         internet = "hosts";
         retiolum = "hosts";
       };
@@ -334,6 +334,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 = {
-- 
cgit v1.2.3