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

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

View file

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