aboutsummaryrefslogtreecommitdiff
path: root/doc/plugins
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-02-11 17:26:09 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-02-11 17:26:09 -0500
commit046095552ac231366d71a3c7a84bdc6d46662212 (patch)
tree959e814144c3e92078960d37338958fa56e284b2 /doc/plugins
parentf2d6d4f6b24bb399481c40dc6eb6f3fe25190c5d (diff)
downloadikiwiki-046095552ac231366d71a3c7a84bdc6d46662212.tar
ikiwiki-046095552ac231366d71a3c7a84bdc6d46662212.tar.gz
httpauth: When cgiauthurl is configured, httpauth can now be used alongside other authentication methods (like openid or anonok). Rather than always redirect to the cgiauthurl for authentication, there is now a button on the login form to use it.
Diffstat (limited to 'doc/plugins')
-rw-r--r--doc/plugins/httpauth.mdwn9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 77796a3d7..a7aac558b 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -14,10 +14,11 @@ signed into the wiki. This method is suitable only for private wikis.
## separate cgiauthurl
To use httpauth for a wiki where the content is public, and where
-the `ikiwiki.cgi` needs to be usable without authentication (for searching
-and so on), you can configure a separate url that is used for
-authentication, via the `cgiauthurl` option in the setup file. This
-url will then be redirected to whenever authentication is needed.
+the `ikiwiki.cgi` needs to be usable without authentication (for searching,
+or logging in using other methods, and so on), you can configure a separate
+url that is used for authentication, via the `cgiauthurl` option in the setup
+file. This url will then be redirected to when a user chooses to log in using
+httpauth.
A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi`
into it. Then configure the web server to require authentication only for