From 34133ca7f34d4ef80d83052ca6580e89885837eb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 16 Aug 2018 23:09:20 +0200 Subject: [PATCH] accounts.email: add global certificatesFile option This defaults to `/etc/ssl/certs/ca-certificates.crt` and will be picked up as default by the account specific option. --- modules/accounts/email.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix index 031b8baa2..2f45fe7e7 100644 --- a/modules/accounts/email.nix +++ b/modules/accounts/email.nix @@ -25,8 +25,9 @@ let }; certificatesFile = mkOption { - type = types.nullOr types.path; - default = null; + type = types.path; + default = config.accounts.email.certificatesFile; + defaultText = "config.accounts.email.certificatesFile"; description = '' Path to file containing certificate authorities that should be used to validate the connection authenticity. If @@ -278,6 +279,16 @@ in { options.accounts.email = { + certificatesFile = mkOption { + type = types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = '' + Path to default file containing certificate authorities that + should be used to validate the connection authenticity. This + path may be overridden on a per-account basis. + ''; + }; + maildirBasePath = mkOption { type = types.str; default = "${config.home.homeDirectory}/Maildir";