From 46e818ebbc5446b4215ad9524089d9b2dc91cbd3 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 8 Apr 2016 03:53:34 +0200 Subject: retiolum: don't hardcode routing prefixes --- shared/1systems/wolf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared') 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 = [ -- cgit v1.2.3 From 1241c61b8867b46a572605a69dd9b1fead65aa2b Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 27 Apr 2016 02:24:20 +0200 Subject: test-all-krebs-modules: disable exim-retiolum --- shared/1systems/test-all-krebs-modules.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'shared') 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"; -- cgit v1.2.3