movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nxios/cyrus-imap: fix cyrus-imap certs options (#392716)

Browse source
This commit is contained in:
Nick Cao 2025-04-07 20:01:10 -04:00 • committed by GitHub
commit 5051c4651e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nixos/modules/services/mail/cyrus-imap.nix
View file

@ -72,6 +72,20 @@ let
} cfg.imapdSettings; } cfg.imapdSettings;
in in
{ {
imports = [
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslServerCert" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_server_cert" ]
)
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslServerKey" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_server_key" ]
)
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslCACert" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_client_ca_file" ]
)
];
options.services.cyrus-imap = { options.services.cyrus-imap = {
enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server"; enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server";
debug = mkEnableOption "debugging messages for the Cyrus master process"; debug = mkEnableOption "debugging messages for the Cyrus master process";
@ -294,24 +308,6 @@ in
description = "Path to the configuration file used for Cyrus."; description = "Path to the configuration file used for Cyrus.";
apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig; apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig;
}; };
sslCACert = mkOption {
type = nullOr str;
default = null;
description = "File path which containing one or more CA certificates to use.";
};
sslServerCert = mkOption {
type = nullOr str;
default = null;
description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)";
};
sslServerKey = mkOption {
type = nullOr str;
default = null;
description = "File containing the private key belonging to the global server certificate.";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {