summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-31 14:45:46 -0400
committerEvan Prodromou <evan@status.net>2009-10-31 14:45:46 -0400
commit65cbf05f607a93f4eb34e0019035cc167e2ef032 (patch)
tree4fad21845e4996e979f70b2e99aa96a1f30f8ee3
parentf36162b218cd86a9281da2b5c50dc8db91e23ad5 (diff)
Revert "Revert "Added some explanatory text to README""
This reverts commit 446de62d02f372b6755237ae61e08bfcd4bf5100. Conflicts: README htaccess.sample
-rw-r--r--README4
-rw-r--r--htaccess.sample8
2 files changed, 12 insertions, 0 deletions
diff --git a/README b/README
index 28f99405e..a0fb9ab0b 100644
--- a/README
+++ b/README
@@ -688,9 +688,13 @@ to users on a remote site. (Or not... it's not well tested.) The
If fancy URLs is enabled, access to file attachments can also be
restricted to logged-in users only. Uncomment the appropriate rewrite
+<<<<<<< HEAD:README
rule in .htaccess or your server's httpd.conf. (This most likely will
not work if you are using a virtual server for attachments, so consider
the performance/security tradeoff.)
+=======
+rule in .htaccess or your server's httpd.conf.
+>>>>>>> 446de62... Revert "Added some explanatory text to README":README
Upgrading
=========
diff --git a/htaccess.sample b/htaccess.sample
index 37eb8e01e..373108c81 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -5,6 +5,14 @@
RewriteBase /mublog/
+ # If your site is private and want access to file attachments
+ # restricted to logged-in users only, 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]