about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-07-24 19:28:06 +0000
committerGitHub <noreply@github.com>2019-07-24 19:28:06 +0000
commit5806e71834c636b57f7e5f7b84f52d162f158cf3 (patch)
treece4542af39c6357372acdb3e1dcb473986ee71cd /nixos
parent12d3b615c91c59428538b8732620896370a52373 (diff)
parentc5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb (diff)
downloadnixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar.gz
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar.bz2
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar.lz
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar.xz
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.tar.zst
nixlib-5806e71834c636b57f7e5f7b84f52d162f158cf3.zip
Merge pull request #65299 from Ma27/fix-nextcloud-test
nixos/nextcloud: fix inclusion of trusted_domains in override config
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix2
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