summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/plugins/httpauth.mdwn4
-rwxr-xr-xikiwiki.in2
3 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 394eba26a..d7cbf38b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low
page, and is preserved across rebuilds.
* editpage: Be more aggressive (and less buggy) about cleaning up
temporary files rendered during page preview.
+ * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
+ authentication. Closes: #500524
-- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index fbf366291..11ed223e7 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -3,7 +3,7 @@
This plugin allows HTTP basic authentication to be used to log into the
wiki. To use the plugin, your web server should be set up to perform HTTP
-basic authentiation. The authenticated user will be automatically signed
-into the wiki.
+basic authentiation for at least the directory containing `ikiwiki.cgi`.
+The authenticated user will be automatically signed into the wiki.
This plugin is included in ikiwiki, but is not enabled by default.
diff --git a/ikiwiki.in b/ikiwiki.in
index 973ae3b31..4f24cfc2e 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -184,7 +184,7 @@ sub main () { #{{{
# do nothing
}
else {
- if ($config{rebuild}}) {
+ if ($config{rebuild}) {
debug(gettext("rebuilding wiki.."));
}
else {