summary refs log tree commit diff
path: root/nixos/tests/opensmtpd.nix
diff options
context:
space:
mode:
authorLéo Gaspard <leo@gaspard.io>2018-10-24 00:07:17 +0900
committerLéo Gaspard <leo@gaspard.io>2018-10-27 12:15:09 +0900
commit58f701ab74568692a49a4230f37eb07b3b63740d (patch)
treee41293bd8d571b07ea394bc57a2098b4e111fd3b /nixos/tests/opensmtpd.nix
parent591ba7335bae245733777c1c4eeedb4d34ef57af (diff)
downloadnixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar.gz
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar.bz2
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar.lz
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar.xz
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.tar.zst
nixpkgs-58f701ab74568692a49a4230f37eb07b3b63740d.zip
opensmtpd: 6.0.3p1 -> 6.4.0p1
Diffstat (limited to 'nixos/tests/opensmtpd.nix')
-rw-r--r--nixos/tests/opensmtpd.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 4c0cbca2101..4d3479168f7 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -17,11 +17,12 @@ import ./make-test.nix {
         extraServerArgs = [ "-v" ];
         serverConfiguration = ''
           listen on 0.0.0.0
+          action do_relay relay
           # DO NOT DO THIS IN PRODUCTION!
           # Setting up authentication requires a certificate which is painful in
           # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
           # WELL-CONTROLLED ENVIRONMENT!
-          accept from any for any relay
+          match from any for any action do_relay
         '';
       };
     };
@@ -41,8 +42,9 @@ import ./make-test.nix {
         extraServerArgs = [ "-v" ];
         serverConfiguration = ''
           listen on 0.0.0.0
-          accept from any for local deliver to mda \
+          action dovecot_deliver mda \
             "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
+          match from any for local action dovecot_deliver
         '';
       };
       services.dovecot2 = {