From 41df3589f6f3aab31443a486a9d7e82f4e9ff559 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 4 Oct 2015 20:55:30 +0200 Subject: rmdir: bump ipaddr --- krebs/3modules/tv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 96ab48e6b..49204c74f 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -146,7 +146,7 @@ with import ../../4lib { inherit lib; }; dc = "tv"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["104.233.84.70"]; + addrs4 = ["167.88.34.182"]; aliases = [ "rmdir.internet" ]; -- cgit v1.2.3 From 8167fe985a9d97ec4fd9c5b1c2d559deba100642 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:01:21 +0200 Subject: define spam-ml in krebs/3modules --- krebs/3modules/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9ec9d0a8a..6db39701a 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,6 +105,23 @@ let combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts ); in lib.mapAttrs' (name: value: nameValuePair (("zones/" + name)) ({ text=value; })) all-zones; + krebs.exim-smarthost.internet-aliases = let + format = from: to: + # TODO assert is-retiolum-mail-address to; + { inherit from; + to = if typeOf to == "list" + then concatMapStringsSep "," (getAttr "mail") to + else to.mail; }; + in mapAttrsToList format (with config.krebs.users; let + spam-ml = [ + lass + makefu + tv + ]; + in { + "spam@krebsco.de" = spam-ml; + }); + services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in mkIf (privkey != null) (mkForce [privkey]); -- cgit v1.2.3 From a626c2a070bbc24a37dffc3953842b02db6a703a Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:03:51 +0200 Subject: postmaster@krebsco.de -> spam-ml --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6db39701a..7a67be17e 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -119,6 +119,7 @@ let tv ]; in { + "postmaster@krebsco.de" = spam-ml; # RFC 822 "spam@krebsco.de" = spam-ml; }); -- cgit v1.2.3 From 214bd7a3b2500dd7af3cc10c43b9e9d6eaed8b8c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:06:04 +0200 Subject: register retiolum "internet" aliases --- krebs/3modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 7a67be17e..35e62afb5 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -121,6 +121,12 @@ let in { "postmaster@krebsco.de" = spam-ml; # RFC 822 "spam@krebsco.de" = spam-ml; + # XXX These are no internet aliases + # XXX exim-retiolum hosts should be able to relay to retiolum addresses + "lass@retiolum" = lass; + "makefu@retiolum" = makefu; + "spam@retiolum" = spam-ml; + "tv@retiolum" = tv; }); services.openssh.hostKeys = -- cgit v1.2.3 From 059037f5ec15754563ab1627d3056f128c986f38 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:29:04 +0200 Subject: register krebsco.de internet aliases --- krebs/3modules/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 35e62afb5..430194405 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -120,7 +120,10 @@ let ]; in { "postmaster@krebsco.de" = spam-ml; # RFC 822 + "lass@krebsco.de" = lass; + "makefu@krebsco.de" = makefu; "spam@krebsco.de" = spam-ml; + "tv@krebsco.de" = tv; # XXX These are no internet aliases # XXX exim-retiolum hosts should be able to relay to retiolum addresses "lass@retiolum" = lass; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/67000000.lock: No such file or directory (2)