[Pkg-owncloud-commits] [owncloud] 01/02: htaccess: indent as upstream (no change)

David Prévot taffit at moszumanska.debian.org
Wed Feb 3 19:37:06 UTC 2016


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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 7f3d80ed520a323ef7c87aee106390bfa4b78a74
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 3 15:18:16 2016 -0400

    htaccess: indent as upstream (no change)
    
    Git-Dch: Ignore
---
 debian/config/apache/htaccess | 63 ++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/debian/config/apache/htaccess b/debian/config/apache/htaccess
index 5b37c7e..5d8980a 100644
--- a/debian/config/apache/htaccess
+++ b/debian/config/apache/htaccess
@@ -1,10 +1,11 @@
 <IfModule mod_headers.c>
-<IfModule mod_fcgid.c>
-<IfModule mod_setenvif.c>
-SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
-RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
-</IfModule>
-</IfModule>
+  <IfModule mod_fcgid.c>
+    <IfModule mod_setenvif.c>
+       SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+       RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+    </IfModule>
+  </IfModule>
+
   <IfModule mod_env.c>
     # Add security and privacy related headers
     Header set X-Content-Type-Options "nosniff"
@@ -20,41 +21,41 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
   </FilesMatch>
 </IfModule>
 <IfModule mod_php5.c>
-php_value upload_max_filesize 513M
-php_value post_max_size 513M
-php_value memory_limit 512M
-php_value mbstring.func_overload 0
-php_value always_populate_raw_post_data -1
-php_value default_charset 'UTF-8'
-php_value output_buffering 0
-<IfModule mod_env.c>
-  SetEnv htaccessWorking true
-</IfModule>
+  php_value upload_max_filesize 513M
+  php_value post_max_size 513M
+  php_value memory_limit 512M
+  php_value mbstring.func_overload 0
+  php_value always_populate_raw_post_data -1
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
 </IfModule>
 <IfModule mod_rewrite.c>
-RewriteEngine on
-RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-RewriteRule ^/owncloud/\.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
-RewriteRule ^/owncloud/\.well-known/host-meta\.json /owncloud/public.php?service=host-meta-json [QSA,L]
-RewriteRule ^/owncloud/\.well-known/carddav /owncloud/remote.php/carddav/ [R=301,L]
-RewriteRule ^/owncloud/\.well-known/caldav /owncloud/remote.php/caldav/ [R=301,L]
-RewriteRule ^/owncloud/apps/calendar/caldav\.php /owncloud/remote.php/caldav/ [QSA,L]
-RewriteRule ^/owncloud/apps/contacts/carddav\.php /owncloud/remote.php/carddav/ [QSA,L]
-RewriteRule ^/owncloud/remote/(.*) /owncloud/remote.php [QSA,L]
-RewriteRule ^/owncloud/(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-RewriteRule ^/owncloud/(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
+  RewriteEngine on
+  RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+  RewriteRule ^/owncloud/\.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
+  RewriteRule ^/owncloud/\.well-known/host-meta\.json /owncloud/public.php?service=host-meta-json [QSA,L]
+  RewriteRule ^/owncloud/\.well-known/carddav /owncloud/remote.php/carddav/ [R=301,L]
+  RewriteRule ^/owncloud/\.well-known/caldav /owncloud/remote.php/caldav/ [R=301,L]
+  RewriteRule ^/owncloud/apps/calendar/caldav\.php /owncloud/remote.php/caldav/ [QSA,L]
+  RewriteRule ^/owncloud/apps/contacts/carddav\.php /owncloud/remote.php/carddav/ [QSA,L]
+  RewriteRule ^/owncloud/remote/(.*) /owncloud/remote.php [QSA,L]
+  RewriteRule ^/owncloud/(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
+  RewriteRule ^/owncloud/(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
-AddType image/svg+xml svg svgz
-AddEncoding gzip svgz
+  AddType image/svg+xml svg svgz
+  AddEncoding gzip svgz
 </IfModule>
 <IfModule mod_dir.c>
-DirectoryIndex index.php index.html
+  DirectoryIndex index.php index.html
 </IfModule>
 AddDefaultCharset utf-8
 Options -Indexes
 <IfModule pagespeed_module>
-        ModPagespeed Off
+  ModPagespeed Off
 </IfModule>
 <IfModule mod_headers.c>
   <FilesMatch "\.(css|js)$">

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



More information about the Pkg-owncloud-commits mailing list