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.master
parent
e5c8bc6222
commit
3b83e52018
|
@ -2,14 +2,14 @@
|
|||
# Copyright © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
|
||||
# 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");
|
||||
}
|
||||
|
|
@ -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)
|
||||
|
|
|
@ -118,7 +118,7 @@ Copyright:
|
|||
© 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
|
||||
License: GPL-2+
|
||||
|
||||
Files: apache404.pm
|
||||
Files: 404.pm
|
||||
Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
|
||||
License: GPL-2+
|
||||
|
||||
|
|
|
@ -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,
|
|
@ -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`
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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';
|
Loading…
Reference in New Issue