diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-15 18:17:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 18:17:10 +0000 |
| commit | e88fb2d10c7c36b7faef9634222e4c64d95d1765 (patch) | |
| tree | f92b1e99136561f6c711609ef4392542d36ca3af /nixos | |
| parent | d3f90efd81b0193b30f124f065a2ad3368030852 (diff) | |
| parent | 0ca7d945c2a06c7a18481c95263c008aead6bfc4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 60d403553352c..23ebbdb7f71b0 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -603,10 +603,10 @@ in { priority = 210; extraConfig = '' location = /.well-known/carddav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; } location = /.well-known/caldav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; } try_files $uri $uri/ =404; ''; @@ -614,7 +614,7 @@ in { "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' return 404; ''; - "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' + "~ ^/(?:\\.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = '' return 404; ''; "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = { |