0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00

services/nextcloud: more consistent code

This commit is contained in:
stuebinm 2022-06-30 22:21:43 +02:00
parent 92fe62e1de
commit ef75aab612

View file

@ -739,12 +739,11 @@ in {
${objectstoreConfig}
];
$EXTRACONFIG = nix_decode_json_file(
$CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file(
"${jsonFormat.generate "nextcloud-extraOptions.json" cfg.extraOptions}",
"decoding json extra options file failed"
);
));
$CONFIG = array_replace_recursive($CONFIG, $EXTRACONFIG);
${optionalString (cfg.secretFile != null) ''
$CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file(
"${cfg.secretFile}",