summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/1systems/test-all-krebs-modules.nix9
-rw-r--r--shared/1systems/wolf.nix4
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 = [