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

Merge pull request #65299 from Ma27/fix-nextcloud-test

Browse source 
nixos/nextcloud: fix inclusion of trusted_domains in override config
This commit is contained in:
Robin Gloster 2019-07-24 19:28:06 +00:00 • committed by GitHub
commit 5806e71834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -333,7 +333,7 @@ in {
${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"}
${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"}
'dbtype' => '${c.dbtype}', 'dbtype' => '${c.dbtype}',
'trusted_domains' => ${writePhpArrary c.extraTrustedDomains}, 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
]; ];
''; '';
occInstallCmd = let occInstallCmd = let