Merge remote-tracking branch 'ni/master'

109 files changed, 10 insertions, 5129 deletions

diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix
index 82f8ec942..01597f49f 100644
--- a/krebs/2configs/exim-smarthost.nix
+++ b/krebs/2configs/exim-smarthost.nix
@@ -16,6 +16,14 @@ in {
         tv
       ];
       eloop-ml = spam-ml;
+      krebstel-ml = [
+        config.krebs.users."0x4A6F"
+        { mail = "krebstel-1rxz0mqa95nkmk298s1731ly0ii7vc36kkm36pnjj89hrq52pgn1@ni.r"; }
+        { mail = "krebstel-1difh7483axpiaq92ghi14r5cql822wbhixqb0nn3y3jkcj0b785@ni.r"; }
+        { mail = "lass@green.r"; }
+        tv
+        xkey
+      ];
       spam-ml = [
         lass
         makefu
@@ -28,6 +36,7 @@ in {
       "spam@eloop.org" = eloop-ml;
       "youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead
       "postmaster@krebsco.de" = spam-ml; # RFC 822
+      "krebstel@krebsco.de" = krebstel-ml;
       "lass@krebsco.de" = lass;
       "makefu@krebsco.de" = makefu;
       "spam@krebsco.de" = spam-ml;
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 7af6b13d9..70fc05813 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -6,6 +6,7 @@ let
 
   out = {
     imports = [
+      ../../kartei
       ./acl.nix
       ./airdcpp.nix
       ./announce-activation.nix
@@ -100,17 +101,6 @@ let
   };
 
   imp = lib.mkMerge [
-    { krebs = import ./external { inherit config; }; }
-    { krebs = import ./external/dbalan.nix { inherit config; }; }
-    { krebs = import ./external/kmein.nix { inherit config; }; }
-    { krebs = import ./external/mic92.nix { inherit config; }; }
-    { krebs = import ./external/palo.nix { inherit config; }; }
-    { krebs = import ./external/rtunreal.nix { inherit config; }; }
-    { krebs = import ./jeschli { inherit config; }; }
-    { krebs = import ./krebs  { inherit config; }; }
-    { krebs = import ./lass   { inherit config; }; }
-    { krebs = import ./makefu { inherit config; }; }
-    { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {
         "krebsco.de" = "zones";
diff --git a/krebs/3modules/external/dbalan.nix b/krebs/3modules/external/dbalan.nix
deleted file mode 100644
index 301f010d3..000000000
--- a/krebs/3modules/external/dbalan.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-with import <stockholm/lib>;
-{ config, ... }:
-let
-  hostDefaults = hostName: host: flip recursiveUpdate host ({
-    ci = false;
-    external = true;
-    monitoring = false;
-    owner = config.krebs.users.dbalan;
-  } // optionalAttrs (host.nets?retiolum) {
-    nets.retiolum = {
-      ip6.addr = (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
-    };
-  } // optionalAttrs (host.nets?wiregrill) {
-    nets.wiregrill = {
-      ip6.addr = (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
-    };
-  });
-in
-{
-  users = rec {
-    dbalan = {
-      mail = "dbalan@thaum.space";
-      pubkey = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIAiWF+U3VHNfp1IPU0/TWhMioxJvmoyG1AMZMvnQjy5QAAAABHNzaDo= dj@v60";
-    };
-  };
-  hosts = mapAttrs hostDefaults {
-    v60 = {
-      nets.retiolum = {
-        aliases = [ "v60.dbalan.r" ];
-        ip4.addr = "10.243.42.12";
-        tinc.pubkey = ''
-          -----BEGIN RSA PUBLIC KEY-----
-          MIICCgKCAgEAxVRxcCWfjLu9cNo5ELfXyuwhpJBSfod5f9JkclSpydVHaQBfeVC6
-          RKfdknQVL6RXiCMFsSAvCvmnIohmpUCbiQWu29P/g0jzQZZ7zNx5L7JHy18x9qAr
-          1scu7FRdVErVuWKXXNt0+j45dA+u5HE6RLsjAHGYtQbAr21VLyLF3qq11IWNrFYU
-          uqSnM/ZPbOPPHLS8XtsQRdJ2cOkccSCO4W6xBar92aPFuDImH60VuxMFEKYWY2bz
-          p6q0K0rtRqW1qANTV62SUDeA1wMPlSmvnMFY7qesSLk6tJjJ02HwwiOvK2ov1/Rm
-          bpwcrqrrbUxbCaZC6t7pBBxUOZlGfnO3woZQm63+4TEw/YDHhxD0HbhH88Wc+eHy
-          I73tuL1oc01JxL131bJV6jcHG7LrG7wTsTdDaZpjbH54adJP47QpTMb0ggsx2WkD
-          mpxFFSnTZL7ghZO5NGPvidTBp+wJiSOv5igAjA72CvjR3tOF4d5Lsq4JsQeCStjA
-          OPrIrN0AnJRg2IFDXZEGwTS9AbLWX147O9VrNimLzezOylH4Eihn7GUJ5KLIPjLy
-          AvsgIYljoJuhGbM8QoWlakwqOndMeoqhz52ORZ5CDgfybJJEbyrYF8gYFVNJOzds
-          9gy/F+27TwfjMgcheN2+ogJp+lD754aCF0EJMwaK8ElzQLqAzbBRGAsCAwEAAQ==
-          -----END RSA PUBLIC KEY-----
-        '';
-        tinc.pubkey_ed25519 = "dcPFpCG94cq1KHD4TH9WgOl9fpc1589YvWkmnkEZcSC";
-      };
-    };
-  };
-}
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
deleted file mode 100644
index 62cbb78a8..000000000
--- a/krebs/3modules/external/default.nix
+++ /dev/null
@@ -1,881 +0,0 @@
-with import <stockholm/lib>;
-{ config, ... }: let
-
-  hostDefaults = hostName: host: flip recursiveUpdate host ({
-    ci = false;
-    external = true;
-    monitoring = false;
-  } // optionalAttrs (host.nets?retiolum) {
-    nets.retiolum.ip6.addr =
-      (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
-  } // optionalAttrs (host.nets?wiregrill) {
-    nets.wiregrill.ip6.addr =
-      (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
-  });
-  ssh-for = name: builtins.readFile (./ssh + "/${name}.pub");
-  tinc-for = name: builtins.readFile (./tinc + "/${name}.pub");
-
-in {
-  hosts = mapAttrs hostDefaults {
-    helsinki = {
-      owner = config.krebs.users.ajs124;
-      nets = {
-        retiolum = {
-          ip4.addr = "10.243.10.1";
-          aliases = [ "helsinki.r" ];