Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aebcd5cd6a71
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d73f269f6ea0
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 12, 2020

  1. nixos/tests/postfix: migrate test to use tlsTrustedAuthorities 

    Fixes: 632104e ("postfix: deprecated `sslCACert` in favour of
`tlsTrustedAuthorities`")
    @mweinelt
    mweinelt committed Nov 12, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1b5a1c6 View commit details

  2. postfix: add passthru tests

    @mweinelt
    mweinelt committed Nov 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9309563 View commit details

  3. Merge pull request #94484 from mweinelt/postfix 

    nixos/tests/postfix: migrate test to use tlsTrustedAuthorities
    @nlewo
    nlewo authored Nov 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d73f269 View commit details
Showing with 6 additions and 4 deletions.
  1. +3 −3 nixos/tests/postfix.nix
  2. +3 −1 pkgs/servers/mail/postfix/default.nix
6 changes: 3 additions & 3 deletions nixos/tests/postfix.nix
View file
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ import ./make-test-python.nix {
enable = true;
enableSubmission = true;
enableSubmissions = true;
sslCACert = certs.ca.cert;
sslCert = certs.${domain}.cert;
sslKey = certs.${domain}.key;
tlsTrustedAuthorities = "${certs.ca.cert}";
sslCert = "${certs.${domain}.cert}";
sslKey = "${certs.${domain}.key}";
submissionsOptions = {
smtpd_sasl_auth_enable = "yes";
smtpd_client_restrictions = "permit";
4 changes: 3 additions & 1 deletion pkgs/servers/mail/postfix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
, coreutils, findutils, gnugrep, gawk, icu, pcre, m4
, buildPackages
, buildPackages, nixosTests
, withLDAP ? true, openldap
, withPgSQL ? false, postgresql
, withMySQL ? false, libmysqlclient
@@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {
--prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]}
'';

passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; };

meta = with lib; {
homepage = "http://www.postfix.org/";
description = "A fast, easy to administer, and secure mail server";