diff options
| author | lassulus <lass@lassul.us> | 2017-05-09 23:43:46 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-05-09 23:43:46 +0200 |
| commit | 4f8dbc57c456b2e6c551772269dacf13217ae589 (patch) | |
| tree | d7f7bdf13ee6723a0cba7e2ee9a7a53cd1817736 /krebs/3modules | |
| parent | 689399546d38b6dc5a643cc2efad9c1d0ae76058 (diff) | |
| parent | 66f9170f524a1a59ba7b69b2fc778c99ccbd41ff (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 25 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 4 |
2 files changed, 25 insertions, 4 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index d539d416..daa963bc 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,9 +105,7 @@ let gg23 = "hosts"; shack = "hosts"; i = "hosts"; - internet = "hosts"; r = "hosts"; - retiolum = "hosts"; }; krebs.users = { @@ -141,6 +139,29 @@ let ) cfg.hosts )); + # TODO dedup with networking.extraHosts + nixpkgs.config.packageOverrides = oldpkgs: + let + domains = attrNames (filterAttrs (_: eq "hosts") cfg.dns.providers); + check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains; + in + { + retiolum-hosts = oldpkgs.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 cfg.hosts))))} + ''; + }; + # Implements environment.etc."zones/<zone-name>" environment.etc = let stripEmptyLines = s: (concatStringsSep "\n" diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index e387fabc..0db68600 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -413,8 +413,8 @@ with import <stockholm/lib>; dv = { mail = "dv@alnus.r"; }; - mv-cd = { - mail = "mv@cd.r"; + mv-ni = { + mail = "mv@ni.r"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod"; }; tv = { |