From 6830a9b32a19d3347f005a491d7a2c8f4094090c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:39:02 +0100
Subject: krebs-hosts-*: generate from krebs.hosts

---
 krebs/3modules/retiolum-hosts.nix | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'krebs/3modules/retiolum-hosts.nix')

diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
index ddf85ead..2da174be 100644
--- a/krebs/3modules/retiolum-hosts.nix
+++ b/krebs/3modules/retiolum-hosts.nix
@@ -1,28 +1,8 @@
 with import <stockholm/lib>;
-{ config, ... }: let
-  # TODO dedup functions with ./hosts.nix
-  check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
-  domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
-in {
+{ config, pkgs, ... }: {
   nixpkgs.config.packageOverrides = super: {
     retiolum-hosts =
-      super.writeText "retiolum-hosts" ''
-        ${
-          concatStringsSep
-            "\n"
-            (flatten
-              (map
-                (host: let
-                  net = host.nets.retiolum;
-                  aliases = longs;
-                  longs = filter check net.aliases;
-                in
-                  optionals
-                    (aliases != [])
-                    (map (addr: "${addr} ${toString aliases}") net.addrs))
-                (filter (host: hasAttr "retiolum" host.nets)
-                        (attrValues config.krebs.hosts))))
-        }
-      '';
+      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
+      pkgs.krebs-hosts-retiolum;
   };
 }
-- 
cgit v1.2.3


From bc4984c7fa6a50052436399364d2de7f76f1cd2e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 14:40:57 +0100
Subject: retiolum-hosts: RIP

---
 krebs/3modules/retiolum-hosts.nix | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 krebs/3modules/retiolum-hosts.nix

(limited to 'krebs/3modules/retiolum-hosts.nix')

diff --git a/krebs/3modules/retiolum-hosts.nix b/krebs/3modules/retiolum-hosts.nix
deleted file mode 100644
index 2da174be..00000000
--- a/krebs/3modules/retiolum-hosts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: {
-  nixpkgs.config.packageOverrides = super: {
-    retiolum-hosts =
-      trace "pkgs.retiolum-hosts is deprecated, use pkgs.krebs-hosts-retiolum instead"
-      pkgs.krebs-hosts-retiolum;
-  };
-}
-- 
cgit v1.2.3