diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-07-23 13:15:27 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2019-07-23 13:29:43 +0200 |
| commit | c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb (patch) | |
| tree | f3f36a3a0686593051556a86006da973070320ab /nixos/modules/services | |
| parent | f99063f6a1c2ee14794c3d79d51a7d3a497bee83 (diff) | |
| download | nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar.gz nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar.bz2 nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar.lz nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar.xz nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.tar.zst nixlib-c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb.zip | |
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.
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |