summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorobadz <3359345+obadz@users.noreply.github.com>2018-10-28 13:00:57 +0000
committerGitHub <noreply@github.com>2018-10-28 13:00:57 +0000
commit07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10 (patch)
tree63f2fa35d4587d31b5cfb285f94eda78f59b5aba /nixos/tests
parent0a7f6ed9ef3a1b8393ee47fa11768e09c963fcba (diff)
parent58f701ab74568692a49a4230f37eb07b3b63740d (diff)
downloadnixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar.gz
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar.bz2
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar.lz
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar.xz
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.tar.zst
nixlib-07db5f1c8cccab5cdc40a3dca8bcea7881ccfb10.zip
Merge pull request #48901 from Ekleog/opensmtpd-6.4.0
opensmtpd: 6.0.3p1 -> 6.4.0
Diffstat (limited to 'nixos/tests')
-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 4c0cbca21010..4d3479168f70 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 = {