Merge remote-tracking branch 'cd/master' into before-merge

1 files changed, 9 insertions, 59 deletions

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index b385848f1..4f66b3592 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -8,16 +8,18 @@ with lib;
 
   krebs.build.target = "root@cd.internet";
 
-  krebs.build.deps = {
-    nixpkgs = {
+  krebs.build.source = {
+    git.nixpkgs = {
       url = https://github.com/4z3/nixpkgs;
       rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
     };
-    secrets = {
-      url = "/home/tv/secrets/${config.krebs.build.host.name}";
+    dir.secrets = {
+      host = config.krebs.hosts.wu;
+      path = "/home/tv/secrets/cd";
     };
-    stockholm = {
-      url = toString ../..;
+    dir.stockholm = {
+      host = config.krebs.hosts.wu;
+      path = "/home/tv/stockholm";
     };
   };
 
@@ -26,6 +28,7 @@ with lib;
     ../2configs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     #../2configs/consul-server.nix
+    ../2configs/exim-smarthost.nix
     ../2configs/git.nix
     {
       imports = [ ../2configs/charybdis.nix ];
@@ -41,59 +44,6 @@ with lib;
       };
     }
     {
-      krebs.exim-smarthost = {
-        enable = true;
-        primary_hostname = "${config.networking.hostName}.retiolum";
-        sender_domains = [
-          "shackspace.de"
-          "viljetic.de"
-        ];
-        relay_from_hosts = [
-          "10.243.13.37"
-        ];
-        internet-aliases = with config.krebs.users; [
-          { from = "tomislav@viljetic.de"; to = tv.mail; }
-
-          # (mindestens) lisp-stammtisch und elli haben die:
-          { from = "tv@viljetic.de"; to = tv.mail; }
-
-          { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
-
-          { from = "mirko@viljetic.de"; to = mv.mail; }
-
-          # TODO killme (wo wird die benutzt?)
-          { from = "tv@cd.retiolum"; to = tv.mail; }
-
-          # TODO lists@smtp.retiolum [consul]
-          { from = "postmaster@krebsco.de"; to = tv.mail; }
-
-          { from = "spam@krebsco.de";
-            to = pkgs.lib.concatStringsSep "," [
-              tv.mail
-              "lass@mors.retiolum"
-              makefu.mail
-            ];
-          }
-        ];
-        system-aliases = [
-          { from = "mailer-daemon"; to = "postmaster"; }
-          { from = "postmaster"; to = "root"; }
-          { from = "nobody"; to = "root"; }
-          { from = "hostmaster"; to = "root"; }
-          { from = "usenet"; to = "root"; }
-          { from = "news"; to = "root"; }
-          { from = "webmaster"; to = "root"; }
-          { from = "www"; to = "root"; }
-          { from = "ftp"; to = "root"; }
-          { from = "abuse"; to = "root"; }
-          { from = "noc"; to = "root"; }
-          { from = "security"; to = "root"; }
-          { from = "root"; to = "tv"; }
-          { from = "mirko"; to = "mv"; }
-        ];
-      };
-    }
-    {
       krebs.github-hosts-sync.enable = true;
       tv.iptables.input-internet-accept-new-tcp =
         singleton config.krebs.github-hosts-sync.port;