external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Merge branch 'owncloud' of github.com:jkaberg/mailinabox into owncloud

Browse Source 
Conflicts:
	conf/nginx.conf
	setup/zpush.sh
This commit is contained in:
Joshua Tauberer
2014-08-12 23:10:51 +00:00
parent c9bf57eacd e828dd63e1
commit 05cc63b5d5
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
conf/nginx.conf
View File

@@ -61,13 +61,10 @@ server {
location ~ ^(/cloud)(/.+\.php)(/.*)?$ {
# note: ~ has precendence over a regular location block
include fastcgi_params;
fastcgi_param PHP_VALUE "upload_max_filesize = 16G";
fastcgi_param PHP_VALUE "post_max_size = 16G";
fastcgi_param PHP_VALUE "output_buffering = 16384";
fastcgi_param PHP_VALUE "memory_limit = 512M";
fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2;
fastcgi_param SCRIPT_NAME $1$2;
fastcgi_param PATH_INFO $3;
fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
fastcgi_pass php-fpm;
error_page 403 /cloud/core/templates/403.php;
error_page 404 /cloud/core/templates/404.php;