Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'Mic92/master' into head

Browse Source
This commit is contained in:
tv 2023-03-09 10:35:23 +01:00
commit 08cc57041c
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kartei/mic92/default.nix
View File

@ -827,7 +827,14 @@ in {
ruby = { ruby = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = {
# of4.dse.cit.tum.de.
ip4.addr = "131.159.38.101";
ip6.addr = "2a09:80c0:38::101";
aliases = [ "ruby.i" ];
};
retiolum = { retiolum = {
via = internet;
aliases = [ "ruby.r" ]; aliases = [ "ruby.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -859,6 +866,7 @@ in {
aliases = [ "amy.i" ]; aliases = [ "amy.i" ];
}; };
retiolum = { retiolum = {
via = internet;
aliases = [ "amy.r" ]; aliases = [ "amy.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -884,6 +892,7 @@ in {
aliases = [ "rose.i" ]; aliases = [ "rose.i" ];
}; };
retiolum = { retiolum = {
via = internet;
aliases = [ "rose.r" ]; aliases = [ "rose.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -910,6 +919,7 @@ in {
aliases = [ "clara.i" ]; aliases = [ "clara.i" ];
}; };
retiolum = { retiolum = {
via = internet;
aliases = [ "clara.r" ]; aliases = [ "clara.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

9
krebs/3modules/exim-smarthost.nix
View File

@ -39,6 +39,11 @@ let
default = []; default = [];
}; };
extraRouters = mkOption {
type = types.nullOr types.str;
default = null;
};
internet-aliases = mkOption { internet-aliases = mkOption {
type = types.listOf (types.submodule ({ type = types.listOf (types.submodule ({
options = { options = {
@ -50,6 +55,7 @@ let
}; };
}; };
})); }));
default = [];
}; };
local_domains = mkOption { local_domains = mkOption {
@ -104,6 +110,7 @@ let
}; };
}; };
})); }));
default = [];
}; };
}; };
@ -254,6 +261,8 @@ let
transport = home_maildir transport = home_maildir
cannot_route_message = Unknown user cannot_route_message = Unknown user
${lib.optionalString (cfg.extraRouters != null) cfg.extraRouters}
begin transports begin transports
retiolum_smtp: retiolum_smtp: