diff options
| -rw-r--r-- | IkiWiki/Setup.pm | 7 | ||||
| -rw-r--r-- | doc/ikiwiki.setup | 2 | ||||
| -rwxr-xr-x | ikiwiki | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 63659ce2e..0c8ad9208 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -9,8 +9,11 @@ sub setup () { # {{{ my $setup=possibly_foolish_untaint($config{setup}); delete $config{setup}; open (IN, $setup) || error("read $setup: $!\n"); - local $/=undef; - my $code=<IN>; + my $code; + { + local $/=undef; + $code=<IN>; + } ($code)=$code=~/(.*)/s; close IN; diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index b81983080..bd82f3d10 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -45,5 +45,5 @@ use IkiWiki::Setup::Standard { # Can anonymous web users edit pages? #anonok => 1, # Generate rss feeds for pages? - #rss => 1, + rss => 1, } @@ -466,7 +466,13 @@ sub globlist_match ($$) { #{{{ sub main () { #{{{ getconfig(); - if ($config{setup}) { + if ($config{cgi}) { + lockwiki(); + loadindex(); + require IkiWiki::CGI; + cgi(); + } + elsif ($config{setup}) { require IkiWiki::Setup; setup(); } @@ -475,12 +481,6 @@ sub main () { #{{{ require IkiWiki::Wrapper; gen_wrapper(); } - elsif ($config{cgi}) { - lockwiki(); - loadindex(); - require IkiWiki::CGI; - cgi(); - } else { lockwiki(); loadindex(); |