Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / htaccess.sample

diff --git a/htaccess.sample b/htaccess.sample
index 373108c81650757c0e8e4fb731d47e5d0851c994..90e18e72e678e68a818b5051d73dd26a0477a937 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,24 +1,33 @@
 <IfModule mod_rewrite.c>
   RewriteEngine On
 
-  # NOTE: change this to your actual StatusNet path; may be "/".
-
-  RewriteBase /mublog/
-
-  # If your site is private and want access to file attachments
-  # restricted to logged-in users only, uncomment this rule.
+  # NOTE: change this to your actual StatusNet base URL path,
+  # minus the domain part:
   #
-  # If you have a custom attachment path
-  # ($config['attachments']['path']), change "file/" to match.
+  #   http://example.com/        => /
+  #   http://example.com/mublog/ => /mublog/
+  #
+  RewriteBase /
+  #RewriteBase /mublog/
+
+  ## Uncomment these if having trouble with API authentication
+  ## when PHP is running in CGI or FastCGI mode.
   #
-  #RewriteRule ^file/(.*) getfile/$1
+  #RewriteCond %{HTTP:Authorization} ^(.*)
+  #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]
+
+  ## You can also use PATHINFO by using this RewriteRule instead:
+  # RewriteRule (.*) index.php/$1 [L,QSA]
 </IfModule>
 
 <FilesMatch "\.(ini)">
+  # For mod_access_compat in Apache <2.4
   Order allow,deny
-</FilesMatch>
 
+  # Use this instead for Apache >2.4 (mod_authz_host)
+  # Require all denied
+</FilesMatch>