From c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Jul 2019 13:15:27 +0200 Subject: nixos/nextcloud: fix inclusion of trusted_domains in override config Regression I caused with 3944aa051ca503e255a9da5cf03a58faf6dec268, sorry for this! The Nextcloud installer broke back then because `trusted_domains` was an empty value by default (a.k.a an empty array) which seemed to break the config merger of Nextcloud as Nextcloud doesn't do recursive merging and now no domain was trusted because of that, hence Nextcloud was unreachable for the `curl` call. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7051b73fb57c..a0214a75d93e 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -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 -- cgit 1.4.1