movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

services/nextcloud: more consistent code

Browse source
This commit is contained in:
stuebinm 2022-06-30 22:21:43 +02:00
parent 92fe62e1de
commit ef75aab612
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/web-apps/nextcloud.nix
View file

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