diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-04-20 13:34:11 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-04-20 13:34:11 +0000 |
| commit | 958468b0883783cebd57086e80ec58f578c82074 (patch) | |
| tree | f2f6e582caf6ea9306dd44e134815df67ef7bf86 | |
| parent | 2469114dc567fb3a52609b589d85eb28af0cd670 (diff) | |
fix broken example config file and detect this breakage
| -rw-r--r-- | IkiWiki/Wrapper.pm | 3 | ||||
| -rw-r--r-- | doc/ikiwiki.setup | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 85d259117..2e4925a1f 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -19,6 +19,9 @@ sub gen_wrapper () { #{{{ error("cannot create a wrapper that uses a setup file"); } my $wrapper=possibly_foolish_untaint($config{wrapper}); + if (! defined $wrapper || ! length $wrapper) { + error("wrapper filename not specified"); + } delete $config{wrapper}; my @envsave; diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 5353c37b8..9e4d00726 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -34,11 +34,9 @@ use IkiWiki::Setup::Standard { }, #{ # # The cgi wrapper. - # cgiwrapper => { - # cgi => 1, - # wrapper => "/var/www/wiki/ikiwiki.cgi", - # wrappermode => "06755", - # }, + # cgi => 1, + # wrapper => "/var/www/wiki/ikiwiki.cgi", + # wrappermode => "06755", #}, ], |