From 54cc4738ec8d5d03fa7965045b1377b8097910ab Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 9 Mar 2023 09:09:37 +0100 Subject: exim: add extraRouters option --- krebs/3modules/exim-smarthost.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index b3cf212e4..7a5a55d49 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -39,6 +39,11 @@ let default = []; }; + extraRouters = mkOption { + type = types.nullOr types.str; + default = null; + }; + internet-aliases = mkOption { type = types.listOf (types.submodule ({ options = { @@ -254,6 +259,8 @@ let transport = home_maildir cannot_route_message = Unknown user + ${lib.optionalString (cfg.extraRouters != null) cfg.extraRouters} + begin transports retiolum_smtp: -- cgit v1.2.3 From e2b4e63bb42aeccb287fc1684c2e125598c3dbc5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 9 Mar 2023 09:11:45 +0100 Subject: exim: add empty default for internet-aliases & system-aliases --- krebs/3modules/exim-smarthost.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index 7a5a55d49..62f15027a 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -55,6 +55,7 @@ let }; }; })); + default = []; }; local_domains = mkOption { @@ -109,6 +110,7 @@ let }; }; })); + default = []; }; }; -- cgit v1.2.3 From 80459262004c8e31e4937450862e2158a3716095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 8 Mar 2023 13:33:24 +0100 Subject: kartei/mic92: expose public tinc endpoint addresses --- kartei/mic92/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 98580100d..04aa57d1d 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -827,7 +827,14 @@ in { ruby = { owner = config.krebs.users.mic92; nets = rec { + internet = { + # of4.dse.cit.tum.de. + ip4.addr = "131.159.38.101"; + ip6.addr = "2a09:80c0:38::101"; + aliases = [ "ruby.i" ]; + }; retiolum = { + via = internet; aliases = [ "ruby.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -859,6 +866,7 @@ in { aliases = [ "amy.i" ]; }; retiolum = { + via = internet; aliases = [ "amy.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -884,6 +892,7 @@ in { aliases = [ "rose.i" ]; }; retiolum = { + via = internet; aliases = [ "rose.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -910,6 +919,7 @@ in { aliases = [ "clara.i" ]; }; retiolum = { + via = internet; aliases = [ "clara.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3