Unverified Commit b3fcfcfa authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #311766 from pacien/stalwart-0-6-0-module-fixes 

nixos/stalwart-mail: module and test fixes for v0.6.0
parents 5752bc84 e995bb43

nixos/modules/services/mail/stalwart-mail.nix

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ in { 
      store.blob.path = mkDefault "${dataDir}/data/blobs";

      storage.data = mkDefault "db";

      storage.fts = mkDefault "db";

      storage.lookup = mkDefault "db";

      storage.blob = mkDefault "blob";

      resolver.type = mkDefault "system";

      resolver.public-suffix = mkDefault ["https://publicsuffix.org/list/public_suffix_list.dat"];

nixos/tests/stalwart-mail.nix

+7 −5
Original line number Diff line number Diff line
@@ -40,12 +40,14 @@ in import ./make-test-python.nix ({ lib, ... }: { 
          };

        };



        session.auth.mechanisms = [ "PLAIN" ];

        session.auth.directory = "in-memory";

        storage.directory = "in-memory";  # shared with imap

        resolver.public-suffix = [ ];  # do not fetch from web in sandbox



        session.rcpt.directory = "in-memory";

        queue.outbound.next-hop = [ "local" ];

        session.auth.mechanisms = "[plain]";

        session.auth.directory = "'in-memory'";

        storage.directory = "in-memory";



        session.rcpt.directory = "'in-memory'";

        queue.outbound.next-hop = "'local'";



        directory."in-memory" = {

          type = "memory";

pkgs/servers/mail/stalwart/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, stdenv

, darwin

, nix-update-script

, nixosTests

, rocksdb_8_3

}:
@@ -60,7 +61,10 @@ rustPlatform.buildRustPackage { 
  # Tests require reading to /etc/resolv.conf

  doCheck = false;



  passthru.update-script = nix-update-script { };

  passthru = {

    update-script = nix-update-script { };

    stalwart-mail = nixosTests.stalwart-mail;

  };



  meta = with lib; {

    description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)";