external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ownCloud updated to version 8.0.4

This commit is contained in:
Joshua Tauberer 2015-06-14 16:04:07 +00:00
parent 0cbba71c72
commit be2b5a62de
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ Control panel:
System: System:
* The munin system monitoring tool is now installed and accessible at /admin/munin. * The munin system monitoring tool is now installed and accessible at /admin/munin.
* ownCloud updated to version 8.0.4.
v0.10 (June 1, 2015) v0.10 (June 1, 2015)

14
conf/nginx-primaryonly.conf
View File

@ -30,8 +30,8 @@
fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2; fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2;
fastcgi_param SCRIPT_NAME $1$2; fastcgi_param SCRIPT_NAME $1$2;
fastcgi_param PATH_INFO $3; fastcgi_param PATH_INFO $3;
# TODO: see the dispreferred "method 2" for xaccel at https://doc.owncloud.org/server/8.1/admin_manual/configuration_files/serving_static_files_configuration.html
fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on; fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
fastcgi_param MOD_X_ACCEL_REDIRECT_PREFIX /owncloud-xaccel;
fastcgi_read_timeout 630; fastcgi_read_timeout 630;
fastcgi_pass php-fpm; fastcgi_pass php-fpm;
error_page 403 /cloud/core/templates/403.php; error_page 403 /cloud/core/templates/403.php;
@ -39,15 +39,13 @@
client_max_body_size 1G; client_max_body_size 1G;
fastcgi_buffers 64 4K; fastcgi_buffers 64 4K;
} }
location ^~ $STORAGE_ROOT/owncloud { location ^~ /owncloud-xaccel/ {
# This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. It works a little weird. # This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. ownCloud sends the full file
# The full path on disk of the file is passed as the URL path. ownCloud 8 totally # path on disk as a subdirectory under this virtual path.
# busted the sane way this worked in ownCloud 7. There's a pending change using # We must only allow 'internal' redirects within nginx so that the filesystem
# a new parameter to make this make more sense.
# We need to only allow 'internal' redirects within nginx so that the filesystem
# is not exposed to the world. # is not exposed to the world.
internal; internal;
alias $STORAGE_ROOT/owncloud; alias /;
} }
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.

4
setup/owncloud.sh
View File

@ -15,8 +15,8 @@ apt_install \
apt-get purge -qq -y owncloud* apt-get purge -qq -y owncloud*
# Install ownCloud from source of this version: # Install ownCloud from source of this version:
owncloud_ver=8.0.3 owncloud_ver=8.0.4
owncloud_hash=3192f3d783f81247eaf2914df63afdd593def4e5 owncloud_hash=625b1c561ea51426047a3e79eda51ca05e9f978a
# Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than # Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than
# in STORAGE_ROOT. Move the file to STORAGE_ROOT. # in STORAGE_ROOT. Move the file to STORAGE_ROOT.