christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50 from eqyiel/catchall-for-undefined-only 

catchAll for undefined loginAccounts only
This commit is contained in:
Robin Raymond 2017-12-20 08:36:04 +01:00 committed by GitHub
parent f64f870a9f 3a333ab71a
commit b6c2a923f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail-server/postfix.nix
View File

@ -26,7 +26,7 @@ let
valiases_postfix = lib.flatten (lib.mapAttrsToList
(name: value:
let to = name;
in map (from: "${from} ${to}") value.aliases)
in map (from: "${from} ${to}") (value.aliases ++ lib.singleton name))
cfg.loginAccounts);
# catchAllPostfix :: [ String ]

35
tests/extern.nix
View File

@ -48,7 +48,9 @@ import <nixpkgs/nixos/tests/make-test.nix> {
};
client = { config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [ fetchmail msmtp procmail ];
environment.systemPackages = with pkgs; [
fetchmail msmtp procmail findutils
];
};
};
@ -88,6 +90,13 @@ import <nixpkgs/nixos/tests/make-test.nix> {
from chuck\@example.com
user user2\@example.com
password user2
account test4
host SERVER
port 587
from postmaster\@example.com
user user1\@example.com
password user1
'';
email1 =
''
@ -117,6 +126,20 @@ import <nixpkgs/nixos/tests/make-test.nix> {
XOXO User1
'';
email3 =
''
From: Postmaster <postmaster@example.com>
To: Chuck <chuck@example.com>
Cc:
Bcc:
Subject: This is a test Email from postmaster\@example.com to chuck
Reply-To:
Hello Chuck,
I think I may have misconfigured the mail server
XOXO Postmaster
'';
in
''
startAll;
@ -196,6 +219,16 @@ import <nixpkgs/nixos/tests/make-test.nix> {
$client->succeed("sleep 5");
# fetchmail returns EXIT_CODE 0 when it retrieves mail
$client->succeed("fetchmail -v");
$client->succeed("rm ~/mail/*");
$client->succeed("rm mail.txt");
$client->succeed("echo '${email2}' > mail.txt");
# send email from user1 to chuck
$client->succeed("msmtp -a test4 --tls=on --tls-certcheck=off --auth=on chuck\@example.com < mail.txt >&2");
$client->succeed("sleep 5");
# fetchmail returns EXIT_CODE 1 when no new mail
# if this succeeds, it means that user1 recieved the mail that was intended for chuck.
$client->fail("fetchmail -v");
};