From bb86d74cca8532a555e1d78eac64d465f59aa3b2 Mon Sep 17 00:00:00 2001
From: Quentin Smith <quentin@mit.edu>
Date: Sat, 13 Mar 2010 18:25:58 -0500
Subject: [PATCH] 404 handling

---
 .htaccess     | 3 +++
 ikiwiki.setup | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 0d6fd99..737896b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -25,3 +25,6 @@ RewriteRule ^wiki(/.*)?$ $1 [R=permanent,L]
 
 # Redirect old /doc/wiki to sipb-www.scripts
 RewriteRule ^doc/wiki(/.*)?$ http://sipb-www.scripts.mit.edu/doc/wiki$1 [R,L]
+
+# Give a better error page for 404s
+ErrorDocument 404 /_wiki-cgi/ikiwiki.cgi
diff --git a/ikiwiki.setup b/ikiwiki.setup
index b44c2c8..c3983d8 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -23,7 +23,7 @@ my %common_setup_args = (
 	# IMPORTANT! If you add plugins that involve interface changes, you
 	# will need to modify our templates to allow this, as our custom
 	# template does not support them yet. See ~/src/ikiwiki/templates
-	add_plugins => [qw(goodstuff html httpauth rename remove)],
+	add_plugins => [qw(goodstuff html httpauth rename remove 404)],
 	# plugins to disable
 	# IMPORTANT! If you reenable passwordauth/openid, you need to
 	# do some modifications described in TODO.SIPB in the source-tree
-- 
2.31.1