From a09bf933da2d31645872f1e2332507da98fb6a00 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')

diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index eb7fd2283..3d572c04d 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