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/hosts.nix | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

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

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 0985bb53..eb7fd228 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -1,6 +1,5 @@
 with import <stockholm/lib>;
 { config, ... }: let
-  # TODO dedup functions with ./retiolum-hosts.nix
   check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
   domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
 in {
@@ -30,6 +29,62 @@ in {
                   map (addr: { ${addr} = aliases; }) net.addrs)
                 (attrValues host.nets))
             (attrValues config.krebs.hosts)));
+
+    nixpkgs.config.packageOverrides = super: let
+      # nameValuePair name value : { "name" : name, "value" : value }
+
+      # addr : str
+      # aliase : str
+      # hostname : str
+      # netname : str
+
+      # addrAliases : nameValuePair addr [alias]
+
+      # hostNetAliases : host -> { ${netname} : [addrAliases] }
+      hostNetAliases = host:
+        mapAttrs (_: net: filter (x: x.name != null) [
+          { name = net.ip4.addr or null; value = net.aliases; }
+          { name = net.ip6.addr or null; value = net.aliases; }
+        ]) host.nets;
+
+      # netAliases : { ${netname} : [addrAliases] }
+      netAliases =
+        foldl'
+          (result: host:
+            foldl'
+              # λ netAliases -> [addrAliases] -> netAliases
+              (result: { name, value }: result // {
+                ${name} = result.${name} or [] ++ value;
+              })
+              result
+              (mapAttrsToList nameValuePair (hostNetAliases host))
+          )
+          {}
+          (attrValues config.krebs.hosts);
+
+      # allAddrAliases : [addrAliases]
+      allAddrAliases =
+        flatten
+          (map
+            (host: attrValues (hostNetAliases host))
+            (attrValues config.krebs.hosts));
+
+      # writeHosts : str -> [addrAliases] -> package
+      writeHosts = name: addrAliases: super.writeText name ''
+        ${concatMapStringsSep
+            "\n"
+            ({ name, value }: "${name} ${toString value}")
+            addrAliases}
+      '';
+    in
+      {
+        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+      }
+      //
+      genAttrs' (attrNames netAliases) (netname: rec {
+        name = "krebs-hosts-${netname}";
+        value = writeHosts name netAliases.${netname};
+      });
   };
 
 }
-- 
cgit v1.2.3


From 659cbed237ebbf158374cc85929f97eb1a6fce36 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 31 Jan 2019 15:02:05 +0100
Subject: krebs-hosts_combined: init

---
 krebs/3modules/hosts.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index eb7fd228..3d572c04 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -62,13 +62,6 @@ in {
           {}
           (attrValues config.krebs.hosts);
 
-      # allAddrAliases : [addrAliases]
-      allAddrAliases =
-        flatten
-          (map
-            (host: attrValues (hostNetAliases host))
-            (attrValues config.krebs.hosts));
-
       # writeHosts : str -> [addrAliases] -> package
       writeHosts = name: addrAliases: super.writeText name ''
         ${concatMapStringsSep
@@ -78,7 +71,18 @@ in {
       '';
     in
       {
-        krebs-hosts = writeHosts "krebs-hosts" allAddrAliases;
+        # hosts file for all krebs networks
+        krebs-hosts =
+          writeHosts "krebs-hosts" (concatLists [
+            netAliases.internet
+            netAliases.retiolum
+            netAliases.wiregrill
+          ]);
+
+        # combined hosts file for all networks (even custom ones)
+        krebs-hosts_combined =
+          writeHosts "krebs-hosts_combined"
+            (concatLists (attrValues netAliases));
       }
       //
       genAttrs' (attrNames netAliases) (netname: rec {
-- 
cgit v1.2.3


From cdb548ac3050c2e9f61a07e6f5eff88383e1114c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 2 Feb 2019 09:22:06 +0100
Subject: krebs-hosts-*: don't add lines without alias

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

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

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index 3d572c04..7fe01a76 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -42,7 +42,7 @@ in {
 
       # hostNetAliases : host -> { ${netname} : [addrAliases] }
       hostNetAliases = host:
-        mapAttrs (_: net: filter (x: x.name != null) [
+        mapAttrs (_: net: filter (x: x.name != null && x.value != []) [
           { name = net.ip4.addr or null; value = net.aliases; }
           { name = net.ip6.addr or null; value = net.aliases; }
         ]) host.nets;
-- 
cgit v1.2.3