[owncloud/f20] drop trusted_domains from config (OC generates it on setup)

[Adam Williamson]

commit 58194ad409d1bc3ad1899de1b5260e2c46a5c773
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jul 29 15:22:02 2014 -0700

    drop trusted_domains from config (OC generates it on setup)
    
    OC's first run setup will generate an appropriate trusted_hosts for
    the server, if none is explicitly specified in config.php prior.
    However, the sample config.php contains an active trusted_hosts
    stanza, and we were shipping this. That meant that OC would not
    generate a correct trusted_hosts for the server it's actually
    running on, but preserve the incorrect example setting from the
    sample config file. So, updating config.patch to comment out that
    stanza makes things work properly. Without this patch, a fresh
    OC deployment is inaccessible after the first run setup until you
    edit the trusted_hosts setting by hand.

 ...0.0-config.patch => owncloud-6.0.2-config.patch |   13 +++++++++++++
 owncloud.spec                                      |    7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/owncloud-6.0.0-config.patch b/owncloud-6.0.2-config.patch
similarity index 75%
rename from owncloud-6.0.0-config.patch
rename to owncloud-6.0.2-config.patch
index c1ad269..617dfcd 100644
--- a/owncloud-6.0.0-config.patch
+++ b/owncloud-6.0.2-config.patch
@@ -1,5 +1,18 @@
 --- config/config.sample.php.orig	2014-01-03 23:31:41.473242989 -0800
 +++ config/config.sample.php	2014-01-03 23:32:32.416737063 -0800
+@@ -59,9 +59,10 @@
+ /* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+ "proxyuserpwd" => "",
+ 
+-/* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */
++/* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers
+ 'trusted_domains' => array('demo.owncloud.org', 'otherdomain.owncloud.org'),
+-
++ */
++ 
+ /* Theme to use for ownCloud */
+ "theme" => "",
+ 
 @@ -142,7 +142,7 @@
  "check_for_working_htaccess" => true,
  
diff --git a/owncloud.spec b/owncloud.spec
index 3b14338..bc8f9ab 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        6.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Private file sync and share server
 
 License:        AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -19,7 +19,7 @@ Source5:        %{name}-postgresql.txt
 Source42:       %{name}-delete-jslint.sh
 
 # adjust default config
-Patch0:         %{name}-6.0.0-config.patch
+Patch0:         %{name}-6.0.2-config.patch
 # Adjust mediaelement not to use its SWF and Silverlight plugins. This
 # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
 # 'plugins:["youtube","vimeo"]'
@@ -351,6 +351,9 @@ fi
 
 
 %changelog
+* Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 6.0.4-2
+- drop trusted_domains from config (OC autogenerates during setup)
+
 * Mon Jun 30 2014 Gregor Tätzner <brummbq at fedoraproject.org> - 6.0.4-1
 - 6.0.4