From a7d9dcab7e2f759a7ff1ff7fb99f92fba75631f0 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 5 Feb 2019 02:59:42 +0900 Subject: [PATCH] nixos/nextcloud: use matching nginx package when configuring nginx NixOS currently defaults services.nginx.package to nginxStable. Including configuration files from nginxMainline could potentially cause incompatible configuration. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index ecb1c5615d58..ee1354d6a997 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -426,7 +426,7 @@ in { "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = { priority = 500; extraConfig = '' - include ${pkgs.nginxMainline}/conf/fastcgi.conf; + include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS ${if cfg.https then "on" else "off"};