diff options
| author | tv <tv@krebsco.de> | 2023-03-09 10:35:23 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2023-03-09 10:35:23 +0100 |
| commit | 08cc57041cf3ba9b53cfdc819969fe50614306db (patch) | |
| tree | 6ac439e0087fec66b78605627b79a62388cb0fd9 | |
| parent | 56bb735f9208ad087e5b7c37763669e88c8c7059 (diff) | |
| parent | 80459262004c8e31e4937450862e2158a3716095 (diff) | |
Merge remote-tracking branch 'Mic92/master' into head
| -rw-r--r-- | kartei/mic92/default.nix | 10 | ||||
| -rw-r--r-- | krebs/3modules/exim-smarthost.nix | 9 |
2 files changed, 19 insertions, 0 deletions
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----- diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index b3cf212e4..62f15027a 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 = { @@ -50,6 +55,7 @@ let }; }; })); + default = []; }; local_domains = mkOption { @@ -104,6 +110,7 @@ let }; }; })); + default = []; }; }; @@ -254,6 +261,8 @@ let transport = home_maildir cannot_route_message = Unknown user + ${lib.optionalString (cfg.extraRouters != null) cfg.extraRouters} + begin transports retiolum_smtp: |