fix broken example config file and detect this breakage

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 85d2591175a3904c97f94bf95566b5dd7cf89336..2e4925a1f049c4d032a853c6443b8bce433b9401 100644 (file)
--- 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 5353c37b89a3d439da2c5869b1a1edeb0a861583..9e4d00726120592b8d7a3cb1c164a2b38bbc1858 100644 (file)
--- 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",
                #},
        ],