diff options
| author | lassulus <lass@lassul.us> | 2017-03-09 19:11:27 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-03-09 19:11:27 +0100 |
| commit | 2578eba9af198888049647c52f5934bfa0c96ef6 (patch) | |
| tree | 87ec46402348d0ace3b7f819fc98e522e597c321 /tv/2configs | |
| parent | c8668be63cdb6a28655e5201495d3d2c8d06b455 (diff) | |
| parent | f30a7dd975aaf5d9dbb2a2ba1186d7dd0c3e04fa (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/default.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/exim-smarthost.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index e170156a4..4c10b2a28 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -38,6 +38,8 @@ with import <stockholm/lib>; # stockholm dependencies environment.systemPackages = with pkgs; [ git + gnumake + hashPassword populate ]; } diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index cc3bdf95d..816dce78d 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -13,7 +13,7 @@ with import <stockholm/lib>; "shackspace.de" "viljetic.de" ]; - relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [ + relay_from_hosts = concatMap (host: host.nets.retiolum.addrs) [ config.krebs.hosts.nomic config.krebs.hosts.wu config.krebs.hosts.xu |