[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-68-g8c567ae

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit bf95ab6272614ecd8f2d9c007bc2d6a5eb123ebd
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu May 17 00:45:55 2012 +0200

    debian/config/apache/htaccess: update from upstream .htaccess and rebase

diff --git a/debian/TODO b/debian/TODO
index bad6eb0..b6071c2 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,7 +4,7 @@ ownCloud packaging TODO list
 * Build pdf.js based on source contained and remove the source.
 * Solve copyright issues:
   - apps/user_openid/class.openid.v3.php - license known, but not the copyright!
-* Ensure mod_rewrite is enabled; it is used by the webfinger app.
+* Ensure mod_rewrite is enabled; it is used by .htaccess.
 * Write patch to prevent installation of 3rd-party apps via the internet, 
   because this is risky. Bad code can be injected.
 
diff --git a/debian/changelog b/debian/changelog
index 212c087..0ba8d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
     host stuff.
   * debian/README.source: added to explain the state of the source and how
     it is processed when installing. 
+  * debian/config/apache/htaccess: update from upstream .htaccess and rebase
+    paths under /owncloud. 
 
  -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 15 May 2012 00:42:12 +0200
 
diff --git a/debian/config/apache/htaccess b/debian/config/apache/htaccess
index dd49442..358537f 100644
--- a/debian/config/apache/htaccess
+++ b/debian/config/apache/htaccess
@@ -1,12 +1,24 @@
+ErrorDocument 403 /owncloud/core/templates/403.php
 ErrorDocument 404 /owncloud/core/templates/404.php
+Redirect 301 /owncloud/apps/calendar/caldav.php /owncloud/remote.php/caldav/
+Redirect 301 /owncloud/apps/contacts/carddav.php /owncloud/remote.php/carddav/
+Redirect 301 /owncloud/apps/files/webdav.php /owncloud/remote.php/webdav/
+Redirect 301 /owncloud/files/webdav.php /owncloud/remote.php/webdav/
 <IfModule mod_php5.c>
 php_value upload_max_filesize 512M
 php_value post_max_size 512M
-php_value memory_limit 128M
-SetEnv htaccessWorking true
+php_value memory_limit 512M
+<IfModule env_module>
+  SetEnv htaccessWorking true
 </IfModule>
-<IfModule !mod_php5.c>
+</IfModule>
+<IfModule mod_rewrite.c>
 RewriteEngine on
-RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+RewriteRule ^/owncloud/.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
+RewriteRule ^/owncloud/.well-known/carddav /owncloud/remote.php/carddav/ [R]
+RewriteRule ^/owncloud/.well-known/caldav /owncloud/remote.php/caldav/ [R]
+RewriteRule ^/owncloud/apps/([^/]*)/(.*\.(css|php))$ /owncloud/index.php?app=$1&getfile=$2 [QSA,L]
+RewriteRule ^/owncloud/remote/(.*) /owncloud/remote.php [QSA,L]
 </IfModule>
 Options -Indexes

-- 
owncloud.git