diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
| commit | 9cba0ffefa95079168f3419cf11eb98400a468db (patch) | |
| tree | f483f11d62ced67b06e017a65417135b9ba8a2ce /shared/1systems | |
| parent | 4de1c87ff62dadc4cbe812a48d10241d79aca183 (diff) | |
| parent | c44e649455f3c162b66fb9d2d678a7a0eeff598b (diff) | |
merge cd/master
Diffstat (limited to 'shared/1systems')
| -rw-r--r-- | shared/1systems/test-all-krebs-modules.nix | 9 | ||||
| -rw-r--r-- | shared/1systems/wolf.nix | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix index 5c3ba9421..0084a7837 100644 --- a/shared/1systems/test-all-krebs-modules.nix +++ b/shared/1systems/test-all-krebs-modules.nix @@ -19,10 +19,11 @@ in { username = "lol"; password = "wut"; }; - exim-retiolum = { - enable = true; - primary_hostname = "test.r"; - }; + # XXX exim-retiolum and exim-smarthost are mutually exclusive + #exim-retiolum = { + # enable = true; + # primary_hostname = "test.r"; + #}; exim-smarthost = { enable = true; primary_hostname = "test.r"; diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index f0323dc2f..53334d6f1 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: let - shack-ip = lib.head config.krebs.build.host.nets.shack.addrs4; - internal-ip = lib.head config.krebs.build.host.nets.retiolum.addrs4; + shack-ip = config.krebs.build.host.nets.shack.ip4.addr; + internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; in { imports = [ |