makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse source
This commit is contained in:
makefu 2015-10-05 17:54:44 +02:00
parent e7779d8016 059037f5ec
commit c8c31c4bc1
3 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
krebs/3modules/default.nix
View file

@ -105,6 +105,33 @@ let
combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts ); combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts );
in lib.mapAttrs' (name: value: nameValuePair (("zones/" + name)) ({ text=value; })) all-zones; 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 {
"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;
"makefu@retiolum" = makefu;
"spam@retiolum" = spam-ml;
"tv@retiolum" = tv;
});
services.openssh.hostKeys = services.openssh.hostKeys =
let inherit (config.krebs.build.host.ssh) privkey; in let inherit (config.krebs.build.host.ssh) privkey; in
mkIf (privkey != null) (mkForce [privkey]); mkIf (privkey != null) (mkForce [privkey]);

2
krebs/3modules/tv/default.nix
View file

@ -146,7 +146,7 @@ with import ../../4lib { inherit lib; };
dc = "tv"; #dc = "cac"; dc = "tv"; #dc = "cac";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["104.233.84.70"]; addrs4 = ["167.88.34.182"];
aliases = [ aliases = [
"rmdir.internet" "rmdir.internet"
]; ];

24
tv/2configs/exim-smarthost.nix
View file

@ -12,28 +12,10 @@
"10.243.13.37" "10.243.13.37"
]; ];
internet-aliases = with config.krebs.users; [ internet-aliases = with config.krebs.users; [
{ from = "tomislav@viljetic.de"; to = tv.mail; }
# (mindestens) lisp-stammtisch und elli haben die:
{ from = "tv@viljetic.de"; to = tv.mail; }
{ from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
{ from = "mirko@viljetic.de"; to = mv.mail; } { from = "mirko@viljetic.de"; to = mv.mail; }
{ from = "tomislav@viljetic.de"; to = tv.mail; }
# TODO killme (wo wird die benutzt?) { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
{ from = "tv@cd.retiolum"; to = tv.mail; } { from = "tv@viljetic.de"; to = tv.mail; }
# TODO lists@smtp.retiolum [consul]
{ from = "postmaster@krebsco.de"; to = tv.mail; }
{ from = "spam@krebsco.de";
to = pkgs.lib.concatStringsSep "," [
tv.mail
"lass@mors.retiolum"
makefu.mail
];
}
]; ];
system-aliases = [ system-aliases = [
{ from = "mailer-daemon"; to = "postmaster"; } { from = "mailer-daemon"; to = "postmaster"; }