[packages/owncloud] synced with 7.0.0's .htaccess

[adamg]

commit 7c0e0b833eb0c7925ae3cda68f8abb079d83780e
Author: Adam Gołębiowski <ad...@pld-linux.org>
Date:   Fri Aug 1 14:52:21 2014 +0200

    synced with 7.0.0's .htaccess

 apache.conf | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/apache.conf b/apache.conf
index 595f163..8065917 100644
--- a/apache.conf
+++ b/apache.conf
@@ -6,16 +6,27 @@ Alias /owncloud /usr/share/owncloud
                php_value upload_max_filesize 512M
                php_value post_max_size 512M
                php_value memory_limit 512M
+               php_value mbstring.func_overload 0
+               <IfModule env_module>
+                       SetEnv htaccessWorking true
+               </IfModule>
        </IfModule>
        <IfModule mod_rewrite.c>
                RewriteEngine on
                RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-               RewriteRule ^.well-known/host-meta 
/owncloud/public.php?service=host-meta [QSA,L]
-               RewriteRule ^.well-known/carddav /owncloud/remote.php/carddav/ 
[R]
-               RewriteRule ^.well-known/caldav /owncloud/remote.php/caldav/ [R]
-               RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ 
index.php?app=$1&getfile=$2 [QSA,L]
-               RewriteRule ^remote/(.*) remote.php [QSA,L]
+               RewriteRule ^\.well-known/host-meta 
/owncloud/public.php?service=host-meta [QSA,L]
+               RewriteRule ^\.well-known/host-meta\.json 
/owncloud/public.php?service=host-meta-json [QSA,L]
+               RewriteRule ^\.well-known/carddav /owncloud/remote.php/carddav/ 
[R]
+               RewriteRule ^\.well-known/caldav /owncloud/remote.php/caldav/ 
[R]
+               RewriteRule ^apps/calendar/caldav\.php 
/owncloud/remote.php/caldav/ [QSA,L]
+               RewriteRule ^apps/contacts/carddav\.php 
/owncloud/remote.php/carddav/ [QSA,L]
+               RewriteRule ^remote/(.*) /owncloud/remote.php [QSA,L]
        </IfModule>
+       <IfModule mod_mime.c>
+               AddType image/svg+xml svg svgz
+               AddEncoding gzip svgz
+       </IfModule>
+       AddDefaultCharset utf-8
        Options -Indexes
        <IfModule mod_authz_core.c>
            # Apache 2.4
@@ -25,6 +36,9 @@ Alias /owncloud /usr/share/owncloud
            Order allow,deny
            Allow from all
        </IfModule>
+       <IfModule pagespeed_module>
+               ModPagespeed Off
+       </IfModule>
 </Directory>
 
 <Directory /usr/share/owncloud/data>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/7c0e0b833eb0c7925ae3cda68f8abb079d83780e

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit