pyrox.dev
Merge pull request #311766 from pacien/stalwart-0-6-0-module-fixes
nixos/stalwart-mail: module and test fixes for v0.6.0
authored by Jonas Heinrich and committed by GitHub b3fcfcfa 5752bc84
+1
nixos/modules/services/mail/stalwart-mail.nix
+1
nixos/modules/services/mail/stalwart-mail.nix
···
38
store.blob.path = mkDefault "${dataDir}/data/blobs";
39
storage.data = mkDefault "db";
40
storage.fts = mkDefault "db";
41
+
storage.lookup = mkDefault "db";
42
storage.blob = mkDefault "blob";
43
resolver.type = mkDefault "system";
44
resolver.public-suffix = mkDefault ["https://publicsuffix.org/list/public_suffix_list.dat"];
+7
-5
nixos/tests/stalwart-mail.nix
+7
-5
nixos/tests/stalwart-mail.nix
···
40
};
41
};
42
43
-
session.auth.mechanisms = [ "PLAIN" ];
44
-
session.auth.directory = "in-memory";
45
-
storage.directory = "in-memory"; # shared with imap
46
47
-
session.rcpt.directory = "in-memory";
48
-
queue.outbound.next-hop = [ "local" ];
49
50
directory."in-memory" = {
51
type = "memory";
···
40
};
41
};
42
43
+
resolver.public-suffix = [ ]; # do not fetch from web in sandbox
44
45
+
session.auth.mechanisms = "[plain]";
46
+
session.auth.directory = "'in-memory'";
47
+
storage.directory = "in-memory";
48
+
49
+
session.rcpt.directory = "'in-memory'";
50
+
queue.outbound.next-hop = "'local'";
51
52
directory."in-memory" = {
53
type = "memory";
+5
-1
pkgs/servers/mail/stalwart/default.nix
+5
-1
pkgs/servers/mail/stalwart/default.nix
···
10
, stdenv
11
, darwin
12
, nix-update-script
13
, rocksdb_8_3
14
}:
15
···
60
# Tests require reading to /etc/resolv.conf
61
doCheck = false;
62
63
-
passthru.update-script = nix-update-script { };
64
65
meta = with lib; {
66
description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)";
···
10
, stdenv
11
, darwin
12
, nix-update-script
13
+
, nixosTests
14
, rocksdb_8_3
15
}:
16
···
61
# Tests require reading to /etc/resolv.conf
62
doCheck = false;
63
64
+
passthru = {
65
+
update-script = nix-update-script { };
66
+
stalwart-mail = nixosTests.stalwart-mail;
67
+
};
68
69
meta = with lib; {
70
description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)";