diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-08 15:17:39 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-08 15:17:39 -0400 |
commit | 55474f44d93ffb35f650ab8ba8b32f4478eba1c3 (patch) | |
tree | 9961699802aeae133dbb0c9d74bf5a5fa2dcc5dc /doc | |
parent | 064b507c534e8ed29f3ac4201300f76e32163697 (diff) | |
download | ikiwiki-55474f44d93ffb35f650ab8ba8b32f4478eba1c3.tar ikiwiki-55474f44d93ffb35f650ab8ba8b32f4478eba1c3.tar.gz |
Expand banned_users; it can now include PageSpecs, which allows banning by IP address.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/banned_users.mdwn | 8 | ||||
-rw-r--r-- | doc/todo/blocking_ip_ranges.mdwn | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/banned_users.mdwn b/doc/banned_users.mdwn index d2bec90f0..c44f8c587 100644 --- a/doc/banned_users.mdwn +++ b/doc/banned_users.mdwn @@ -1,4 +1,10 @@ -Banned users can be configured in the setup file. +Banned users can be configured in the setup file via the `banned_users` +setting. This is a list of user names, or [[PageSpecs|ikiwiki/PageSpec]] +to ban. Using a PageSpec is useful to block an IP address. + +For example: + + banned_users => ['evilspammer', 'ip(192.168.1.1)'], If a banned user attempts to use the ikiwiki CGI, they will receive a 403 Forbidden webpage indicating they are banned. diff --git a/doc/todo/blocking_ip_ranges.mdwn b/doc/todo/blocking_ip_ranges.mdwn index 95026eef1..ac2344ece 100644 --- a/doc/todo/blocking_ip_ranges.mdwn +++ b/doc/todo/blocking_ip_ranges.mdwn @@ -2,3 +2,6 @@ Admins need the ability to block IP ranges. They can already ban users. See [[fileupload]] for a propsal that grew to encompass the potential to do this. + +[[done]] (well, there is no pagespec for IP ranges yet, but we can block +individual IPs) |