dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #94484 from mweinelt/postfix

Browse Source 
nixos/tests/postfix: migrate test to use tlsTrustedAuthorities
This commit is contained in:
lewo 2020-11-12 20:50:35 +01:00 committed by GitHub
commit d73f269f6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/postfix.nix
View File

@ -11,9 +11,9 @@ import ./make-test-python.nix {
enable = true; enable = true;
enableSubmission = true; enableSubmission = true;
enableSubmissions = true; enableSubmissions = true;
sslCACert = certs.ca.cert; tlsTrustedAuthorities = "${certs.ca.cert}";
sslCert = certs.${domain}.cert; sslCert = "${certs.${domain}.cert}";
sslKey = certs.${domain}.key; sslKey = "${certs.${domain}.key}";
submissionsOptions = { submissionsOptions = {
smtpd_sasl_auth_enable = "yes"; smtpd_sasl_auth_enable = "yes";
smtpd_client_restrictions = "permit"; smtpd_client_restrictions = "permit";

4
pkgs/servers/mail/postfix/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
, coreutils, findutils, gnugrep, gawk, icu, pcre, m4 , coreutils, findutils, gnugrep, gawk, icu, pcre, m4
, buildPackages , buildPackages, nixosTests
, withLDAP ? true, openldap , withLDAP ? true, openldap
, withPgSQL ? false, postgresql , withPgSQL ? false, postgresql
, withMySQL ? false, libmysqlclient , withMySQL ? false, libmysqlclient
@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {
--prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]}
''; '';
passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; };
meta = with lib; { meta = with lib; {
homepage = "http://www.postfix.org/"; homepage = "http://www.postfix.org/";
description = "A fast, easy to administer, and secure mail server"; description = "A fast, easy to administer, and secure mail server";