fixes

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 63659ce2e03e7147be14063bf13e24278ddab94f..0c8ad9208d50768d8f2eb37473ddc2f5d85187f4 100644 (file)
--- 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");
        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;
 
        ($code)=$code=~/(.*)/s;
        close IN;
 

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index b81983080fdd73830bdd2bffc1d2210edebc9339..bd82f3d102079303c397546f5b641eb1b1ffaa48 100644 (file)
--- 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?
        # Can anonymous web users edit pages?
        #anonok => 1,
        # Generate rss feeds for pages?

-       #rss => 1,
+       rss => 1,

 }
 }

diff --git a/ikiwiki b/ikiwiki
index 77c7744f912fd8a5050319d257156edc8208d080..ea5604365bad5986dd69c40cdf0cc5257d4a638e 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -466,7 +466,13 @@ sub globlist_match ($$) { #{{{
 sub main () { #{{{
        getconfig();
        
 sub main () { #{{{
        getconfig();
        

-       if ($config{setup}) {
+       if ($config{cgi}) {
+               lockwiki();
+               loadindex();
+               require IkiWiki::CGI;
+               cgi();
+       }
+       elsif ($config{setup}) {

                require IkiWiki::Setup;
                setup();
        }
                require IkiWiki::Setup;
                setup();
        }


@@ -475,12 +481,6 @@ sub main () { #{{{
                require IkiWiki::Wrapper;
                gen_wrapper();
        }
                require IkiWiki::Wrapper;
                gen_wrapper();
        }

-       elsif ($config{cgi}) {
-               lockwiki();
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }

        else {
                lockwiki();
                loadindex();
        else {
                lockwiki();
                loadindex();