1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00

x-accel-redirect dosn't need to process files in ownCloud data directory. TODO: fix for autogeneration

This commit is contained in:
jkaberg 2014-08-13 08:10:53 +02:00
parent 7024b428ad
commit 59c1c670b5

View File

@ -57,6 +57,7 @@ server {
deny all; deny all;
} }
} }
location ~ ^(/cloud)(/.+\.php)(/.*)?$ { location ~ ^(/cloud)(/.+\.php)(/.*)?$ {
# note: ~ has precendence over a regular location block # note: ~ has precendence over a regular location block
include fastcgi_params; include fastcgi_params;
@ -71,12 +72,20 @@ server {
client_max_body_size 1G; client_max_body_size 1G;
fastcgi_buffers 64 4K; fastcgi_buffers 64 4K;
} }
location ~ ^/((caldav|carddav|webdav).*)$ { location ~ ^/((caldav|carddav|webdav).*)$ {
# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either. # Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
# Properly proxying like this seems to work fine. # Properly proxying like this seems to work fine.
proxy_pass https://$HOSTNAME/cloud/remote.php/$1; proxy_pass https://$HOSTNAME/cloud/remote.php/$1;
} }
# location ^~ /cloud/data {
# internal;
# # Set 'alias' if not using the default 'datadirectory'
# # TODO: Since this is auto generated, we need a better approach!
# alias /home/user-data/owncloud;
# }
rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last; rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last; rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect; rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;