From be2b5a62deeb2cd9f5818d397b0cd80f0b1b4cb4 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 14 Jun 2015 16:04:07 +0000
Subject: [PATCH] ownCloud updated to version 8.0.4

---
 CHANGELOG.md                |  1 +
 conf/nginx-primaryonly.conf | 14 ++++++--------
 setup/owncloud.sh           |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa24f70..8a09ff72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Control panel:
 
 System:
 * 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)
diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index c462b22a..8849b2dd 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -30,8 +30,8 @@
 		fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2;
 		fastcgi_param SCRIPT_NAME $1$2;
 		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_PREFIX /owncloud-xaccel;
 		fastcgi_read_timeout 630;
 		fastcgi_pass php-fpm;
 		error_page 403 /cloud/core/templates/403.php;
@@ -39,15 +39,13 @@
 		client_max_body_size 1G;
 		fastcgi_buffers 64 4K;
 	}
-	location ^~ $STORAGE_ROOT/owncloud {
-		# This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. It works a little weird.
-		# The full path on disk of the file is passed as the URL path. ownCloud 8 totally
-		# busted the sane way this worked in ownCloud 7. There's a pending change using
-		# a new parameter to make this make more sense.
-		# We need to only allow 'internal' redirects within nginx so that the filesystem
+	location ^~ /owncloud-xaccel/ {
+		# This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. ownCloud sends the full file
+		# path on disk as a subdirectory under this virtual path.
+		# We must only allow 'internal' redirects within nginx so that the filesystem
 		# is not exposed to the world.
 		internal;
-		alias $STORAGE_ROOT/owncloud;
+		alias /;
 	}
 	location ~ ^/((caldav|carddav|webdav).*)$ {
 		# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 2c408b9e..eb9b54db 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -15,8 +15,8 @@ apt_install \
 apt-get purge -qq -y owncloud*
 
 # Install ownCloud from source of this version:
-owncloud_ver=8.0.3
-owncloud_hash=3192f3d783f81247eaf2914df63afdd593def4e5
+owncloud_ver=8.0.4
+owncloud_hash=625b1c561ea51426047a3e79eda51ca05e9f978a
 
 # Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than
 # in STORAGE_ROOT. Move the file to STORAGE_ROOT.