Merge pull request #101553 from Mic92/nextcloud
Nextcloud: fix ldap integration
commit4f3f06d070f19dd992c306712f6c79a6aa24c5a3
authorMaximilian Bosch <maximilian@mbosch.me>
dateSun 1 Nov 2020, 16:10 (6 years ago)
parent21c9784b7a2a5f
nixos/modules/services/web-apps/nextcloud.nix+2−4
@@ -549,9 +549,7 @@ in {
549549 };
550550 "/" = {
551551 priority = 900;
552− extraConfig = if major < 20
553− then "rewrite ^ /index.php;"
554− else "try_files $uri $uri/ /index.php$request_uri;";
552+ extraConfig = "rewrite ^ /index.php;";
555553 };
556554 "~ ^/store-apps" = {
557555 priority = 201;
@@ -575,7 +573,7 @@ in {
575573 "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = ''
576574 return 404;
577575 '';
578− ${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = {
576+ "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {
579577 priority = 500;
580578 extraConfig = ''
581579 include ${config.services.nginx.package}/conf/fastcgi.conf;
pkgs/servers/nextcloud/default.nix+2−2
@@ -51,7 +51,7 @@ in {
5151 };
5252
5353 nextcloud20 = generic {
54− version = "20.0.0";
55− sha256 = "1n2cv1i56g6qpzkbl5xaf420zzr4y7isg0lskmr7ymk83way0wx2";
54+ version = "20.0.1";
55+ sha256 = "1z1fzz1i41k4dhdhi005l3gzkvnmmgqqz3rdr374cvk73q7bbiln";
5656 };
5757}