summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/hosts.nix20
1 files changed, 12 insertions, 8 deletions
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 {