From 63f73b3295d165a6d60cc3322ec46b2c37f646d0 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 27 May 2023 15:49:05 +0200 Subject: nixos/maddy: change secrets option to accept a list of paths --- nixos/modules/services/mail/maddy.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nixos/modules/services/mail') diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index 701d57f18e0c..3b4a517fb859 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -335,12 +335,13 @@ in { }; secrets = lib.mkOption { - type = lib.types.path; + type = with types; listOf path; description = lib.mdDoc '' - A file containing the various secrets. Should be in the format + A list of files containing the various secrets. Should be in the format expected by systemd's `EnvironmentFile` directory. Secrets can be referenced in the format `{env:VAR}`. ''; + default = [ ]; }; }; @@ -379,7 +380,7 @@ in { User = cfg.user; Group = cfg.group; StateDirectory = [ "maddy" ]; - EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; + EnvironmentFile = cfg.secrets; }; restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; wantedBy = [ "multi-user.target" ]; -- cgit 1.4.1