From db4b55527d527158bd4e7f93128668e646f2cf1f Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 13 Aug 2015 22:31:40 +0200
Subject: krebs/3: add cd extraZones

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

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index d77d00c05..9ad9c9f91 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -455,6 +455,13 @@ let
       cd = {
         cores = 2;
         dc = "tv"; #dc = "cac";
+        extraZones = {
+          "de.krebsco" = ''
+            mx23          IN A ${elemAt nets.internet.addrs4 0}
+            cd            IN A ${elemAt nets.internet.addrs4 0}
+            krebsco.de.   IN MX 5 mx23
+          '';
+        };
         nets = rec {
           internet = {
             addrs4 = ["162.219.7.216"];
-- 
cgit v1.2.3


From f5fa77fb7363ada9386ea8900de49e7ab6faed9b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 14 Aug 2015 15:20:53 +0200
Subject: krebs 3: add lass's mails

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

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9ad9c9f91..ec433dce8 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -309,9 +309,11 @@ let
     users = addNames {
       lass = {
         pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
+        mail = "lass@mors.retiolum";
       };
       uriel = {
         pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
+        mail = "uriel@mors.retiolum";
       };
     };
   };
-- 
cgit v1.2.3


From e8825282a610553fc5c8ca02c2549464c3546bfc Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 14 Aug 2015 15:48:17 +0200
Subject: {tv 2 => krebs 3} exim-smarthost

---
 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 9ad9c9f91..ba501d227 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -7,6 +7,7 @@ let
   out = {
     imports = [
       ./exim-retiolum.nix
+      ./exim-smarthost.nix
       ./github-hosts-sync.nix
       ./git.nix
       ./nginx.nix
-- 
cgit v1.2.3