diff options
| author | Jonas Heinrich <onny@project-insanity.org> | 2023-05-27 15:49:05 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-05-30 13:03:27 +0000 |
| commit | 1c9ddfaf79c93b591c4b8f1d4468b571176064cf (patch) | |
| tree | f4a5a1e7516dba97c177280c4c93e7577f169a1a | |
| parent | maddy: 0.6.3 -> 0.7.0 (diff) | |
| download | nixpkgs-origin/backport-234930-to-release-23.05.tar.gz | |
nixos/maddy: change secrets option to accept a list of pathsorigin/backport-234930-to-release-23.05
(cherry picked from commit 63f73b3295d165a6d60cc3322ec46b2c37f646d0)
| -rw-r--r-- | nixos/modules/services/mail/maddy.nix | 7 |
1 files changed, 4 insertions, 3 deletions
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" ]; |