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:
parent
92fe62e1de
commit
ef75aab612
1 changed files with 2 additions and 3 deletions
|
@ -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}",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue