Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/htaccess.sample b/htaccess.sample
index 634900dbf6a642f24923970de29ba029fe2d56da..91ae9da9be19b7613abb596b85a015be947ab59b 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,12 +1,22 @@
-RewriteEngine On
+<IfModule mod_rewrite.c>
+  RewriteEngine On
 
-# NOTE: change this to your actual Laconica path; may be "/".
+  # NOTE: change this to your actual StatusNet path; may be "/".
 
-RewriteBase /mublog/
+  RewriteBase /mublog/
 
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule (.*) index.php?p=$1 [L,QSA]
+  # If your site is private and want to only allow logged-in users to
+  # be able to download file attachments, uncomment this rule.
+  #
+  # If you have a custom attachment path
+  # ($config['attachments']['path']), change "file/" to match.
+  #
+  #RewriteRule ^file/(.*) getfile/$1
+
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule (.*) index.php?p=$1 [L,QSA]
+</IfModule>
 
 <FilesMatch "\.(ini)">
   Order allow,deny