[Pkg-owncloud-commits] [owncloud] 04/06: Do not change .htaccess owner

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5e9b343c2f6746f94cd977b3d163dd6e4041f96e
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 29 23:42:22 2015 -0400

    Do not change .htaccess owner
    
    /etc/owncloud/htaccess doesn’t need to be owned by www-data anymore
    (but the config dir /etc/owncloud/ still needs to be writable, so…)
---
 debian/TODO                   | 1 -
 debian/config/apache/htaccess | 2 ++
 debian/rules                  | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index d19966b..f45e5a5 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -10,4 +10,3 @@ ownCloud packaging TODO list
 * Figure out what happens if backups are enabled.  Should it work?  What
   does it do?
 * Support other httpds that are also supported by owncloud.
-* Patch so that /etc/owncloud/htaccess doesn't need to be owned by www-data.
diff --git a/debian/config/apache/htaccess b/debian/config/apache/htaccess
index cb55fba..34bd9fa 100644
--- a/debian/config/apache/htaccess
+++ b/debian/config/apache/htaccess
@@ -48,3 +48,5 @@ Options -Indexes
     Header set Cache-Control "max-age=7200, public"
   </FilesMatch>
 </IfModule>
+ErrorDocument 404 /core/templates/404.php
+ErrorDocument 403 /core/templates/403.php
diff --git a/debian/rules b/debian/rules
index ee26dc2..adab809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,6 @@ override_dh_install:
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud
 	chown www-data:www-data debian/owncloud/etc/owncloud/
-	chown www-data:www-data debian/owncloud/etc/owncloud/htaccess
-	chmod 0640 debian/owncloud/etc/owncloud/htaccess
 	for i in assets data backup ; do \
 		chown www-data:www-data debian/owncloud/var/lib/owncloud/$$i && \
 		chmod 2770 debian/owncloud/var/lib/owncloud/$$i ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git