web commit by joey

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 77c7744f912fd8a5050319d257156edc8208d080..f8b43d7204950ff9c7bcfcbbe5bfde28e7b4f47d 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -32,7 +32,7 @@ sub getconfig () { #{{{
                        historyurl => '',
                        diffurl => '',
                        anonok => 0,
-                       rss => 0,
+                       rss => 1,
                        rebuild => 0,
                        wrapper => undef,
                        wrappermode => undef,
@@ -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();