diff options
author | figsoda <figsoda@pm.me> | 2022-11-21 11:01:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-21 11:01:43 -0500 |
commit | 91969d8d37ff17406336da77b852897e94f6193b (patch) | |
tree | 171d1dda0ce893f51d1ad96ce7687d1f3aa5c7c9 /nixos | |
parent | 6b5019a48f876f3288efc626fa8b70ad0c64eb46 (diff) | |
parent | d1dd00b61823e8e98fe44262090b560eee45b344 (diff) |
Merge pull request #201527 from figsoda/lib
lib/attrsets: add concatMapAttrs
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/security/vaultwarden/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 81423e57fd2c3..3ef0bfb090ac4 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -22,9 +22,9 @@ let # we can only check for values consistently after converting them to their corresponding environment variable name. configEnv = let - configEnv = listToAttrs (concatLists (mapAttrsToList (name: value: - if value != null then [ (nameValuePair (nameToEnvVar name) (if isBool value then boolToString value else toString value)) ] else [] - ) cfg.config)); + configEnv = concatMapAttrs (name: value: optionalAttrs (value != null) { + ${nameToEnvVar name} = if isBool value then boolToString value else toString value; + }) cfg.config; in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault"; } // configEnv; |