diff options
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/exim-smarthost.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/exim.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/builders.nix | 8 |
5 files changed, 14 insertions, 6 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 2f3c20906..c114b74df 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -161,7 +161,7 @@ let ciko.mail = "wieczorek.stefan@gmail.com"; Mic92.mail = "joerg@higgsboson.tk"; in { - "cfp@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; + "*@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index 8d9227039..aba6ee0b5 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -164,7 +164,7 @@ let control = dkim_disable_verify accept message = relay not permitted 2 - recipients = lsearch;${lsearch.internet-aliases} + recipients = lsearch*@;${lsearch.internet-aliases} require message = relay not permitted domains = +local_domains : +relay_to_domains @@ -198,7 +198,7 @@ let internet_aliases: debug_print = "R: internet_aliases for $local_part@$domain" driver = redirect - data = ''${lookup{$local_part@$domain}lsearch{${lsearch.internet-aliases}}} + data = ''${lookup{$local_part@$domain}lsearch*@{${lsearch.internet-aliases}}} dnslookup: debug_print = "R: dnslookup for $local_part@$domain" diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix index 16a2a37b6..7b18c72c1 100644 --- a/krebs/3modules/exim.nix +++ b/krebs/3modules/exim.nix @@ -37,7 +37,7 @@ in { }; config = lib.mkIf cfg.enable { environment = { - etc."exim.conf".text = '' + etc."exim.conf".source = pkgs.writeEximConfig "exim.conf" '' exim_user = ${cfg.user.name} exim_group = ${cfg.group.name} exim_path = /var/setuid-wrappers/exim diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 711121a40..12aa91ba8 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -355,11 +355,11 @@ with config.krebs.lib; }; users = rec { mv = { - mail = "mv@cd.retiolum"; + mail = "mv@cd.r"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod"; }; tv = { - mail = "tv@nomic.retiolum"; + mail = "tv@nomic.r"; pgp.pubkeys.default = '' -----BEGIN PGP PUBLIC KEY BLOCK----- diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix index 146e6f9e1..70d65cfc3 100644 --- a/krebs/5pkgs/builders.nix +++ b/krebs/5pkgs/builders.nix @@ -56,6 +56,14 @@ rec { ''; }; + writeEximConfig = name: text: pkgs.runCommand name { + inherit text; + passAsFile = [ "text" ]; + } '' + ${pkgs.exim}/bin/exim -C "$textPath" -bV >/dev/null + mv "$textPath" $out + ''; + writeNixFromCabal = name: path: pkgs.runCommand name {} '' ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out ''; |