Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/htaccess.sample b/htaccess.sample
index 91ae9da9be19b7613abb596b85a015be947ab59b..c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,24 +1,42 @@
 <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 to only allow logged-in users to
-  # be able to download file attachments, uncomment this rule.
+  # NOTE: change this to your actual StatusNet base URL path,
+  # minus the domain part:
+  #
+  #   http://example.com/        => /
+  #   http://example.com/mublog/ => /mublog/
   #
-  # If you have a custom attachment path
-  # ($config['attachments']['path']), change "file/" to match.
+  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]
+<<<<<<< HEAD
+
+  ## 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
+
+  # Use this instead for Apache >2.4 (mod_authz_host)
+  # Require all denied
+</FilesMatch>
+=======
 </IfModule>
 
 <FilesMatch "\.(ini)">
   Order allow,deny
 </FilesMatch>
 
+>>>>>>> Adding htaccess.sample back*shame*