From 3b83e520182a83e4ae6c61ab7b360b0eb939469f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 31 Jan 2009 19:26:36 -0500 Subject: [PATCH] rename apache404 -> 404 This may already work with other web servers that have copied apache's interface, and it should be easy to add support to it for web servers that use some other interface. So, make the name more general. --- IkiWiki/Plugin/{apache404.pm => 404.pm} | 4 ++-- debian/changelog | 2 +- debian/copyright | 2 +- doc/plugins/{apache404.mdwn => 404.mdwn} | 2 +- doc/plugins/goto.mdwn | 2 +- doc/tips/dot_cgi.mdwn | 9 ++++----- t/{apache404.t => 404.t} | 5 ++--- 7 files changed, 12 insertions(+), 14 deletions(-) rename IkiWiki/Plugin/{apache404.pm => 404.pm} (94%) rename doc/plugins/{apache404.mdwn => 404.mdwn} (82%) rename t/{apache404.t => 404.t} (89%) diff --git a/IkiWiki/Plugin/apache404.pm b/IkiWiki/Plugin/404.pm similarity index 94% rename from IkiWiki/Plugin/apache404.pm rename to IkiWiki/Plugin/404.pm index e7ce70435..5550ea7d1 100644 --- a/IkiWiki/Plugin/apache404.pm +++ b/IkiWiki/Plugin/404.pm @@ -2,14 +2,14 @@ # Copyright © 2009 Simon McVittie # Licensed under the GNU GPL, version 2, or any later version published by the # Free Software Foundation -package IkiWiki::Plugin::apache404; +package IkiWiki::Plugin::404; use warnings; use strict; use IkiWiki 3.00; sub import { - hook(type => "cgi", id => 'apache404', call => \&cgi); + hook(type => "cgi", id => '404', call => \&cgi); IkiWiki::loadplugin("goto"); } diff --git a/debian/changelog b/debian/changelog index f3927f121..be32d3abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ ikiwiki (3.04) UNRELEASED; urgency=low - * apache404: New plugin which lets you use the IkiWiki CGI script as + * 404: New plugin which lets you use the IkiWiki CGI script as an Apache 404 handler, to give the behaviour of various other wiki engines where visiting a nonexistent page provides you with a link to create it. (smcv) diff --git a/debian/copyright b/debian/copyright index bdfbaa573..f589b4a8f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -118,7 +118,7 @@ Copyright: © 2008 Simon McVittie License: GPL-2+ -Files: apache404.pm +Files: 404.pm Copyright: © 2009 Simon McVittie License: GPL-2+ diff --git a/doc/plugins/apache404.mdwn b/doc/plugins/404.mdwn similarity index 82% rename from doc/plugins/apache404.mdwn rename to doc/plugins/404.mdwn index bab8fb59d..8d36279c8 100644 --- a/doc/plugins/apache404.mdwn +++ b/doc/plugins/404.mdwn @@ -1,4 +1,4 @@ -[[!template id=plugin name=apache404 author="[[Simon_McVittie|smcv]]"]] +[[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]] [[!tag type/useful]] This plugin lets you use the IkiWiki CGI script as an Apache 404 handler, diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn index 21dda16b2..9c401c5d2 100644 --- a/doc/plugins/goto.mdwn +++ b/doc/plugins/goto.mdwn @@ -2,7 +2,7 @@ [[!tag type/useful]] This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly -for internal use by the [[apache404]], [[comments]] and [[recentchanges]] +for internal use by the [[404]], [[comments]] and [[recentchanges]] plugins, which enable it automatically. With this plugin enabled you can link to `ikiwiki.cgi?do=goto&page=some/where` diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index ffcbf95d4..04d7a9721 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -26,11 +26,10 @@ configuration changes should work anywhere. Or, if you've put it in a `~/public_html`, edit `/etc/apache2/mods-available/userdir.conf`. -You may also want to enable the [[plugins/apache404]] -plugin. To make apache use it, the apache config file -will need a further modification to make it use ikiwiki's CGI -as the apache 404 handler. Something like this, with -the path adjusted to where you've put the CGI: +* You may also want to enable the [[plugins/404]] plugin. + To make apache use it, the apache config file will need a further + modification to make it use ikiwiki's CGI as the apache 404 handler. + Something like this, with the path adjusted to where you've put the CGI: ErrorDocument 404 /cgi-bin/ikiwiki.cgi diff --git a/t/apache404.t b/t/404.t similarity index 89% rename from t/apache404.t rename to t/404.t index 00fc35250..0bb3c6063 100755 --- a/t/apache404.t +++ b/t/404.t @@ -3,11 +3,10 @@ use warnings; use strict; use Test::More tests => 17; -BEGIN { use_ok("IkiWiki::Plugin::apache404"); } +BEGIN { use_ok("IkiWiki::Plugin::404"); } sub cgi_page_from_404 { - return IkiWiki::Plugin::apache404::cgi_page_from_404(shift, shift, - shift); + return IkiWiki::Plugin::404::cgi_page_from_404(shift, shift, shift); } $IkiWiki::config{htmlext} = 'html'; -- 2.26.2