Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 0c4272286d13eace9ee24c393717b6edd93066b9..fb542be20d80dcca05ac7560b35c17e1932f3b32 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,14 +34,18 @@ sub setup_standard {
                delete $setup{wrappers};
                my %startconfig=(%config);
                foreach my $wrapper (@wrappers) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       %config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }
                        gen_wrapper();
                }
                %config=(%startconfig);
        }
        
        foreach my $c (keys %setup) {
+               next if $c eq 'syslog';
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});
@@ -59,11 +63,15 @@ sub setup_standard {
                        $config{$c}=undef;
                }
        }
+       
+       loadplugins();
+       checkconfig();
 
        if ($config{render}) {
                commandline_render();
        }
-       elsif (! $config{refresh}) {
+
+       if (! $config{refresh}) {
                $config{rebuild}=1;
                debug(gettext("rebuilding wiki.."));
        }
@@ -71,8 +79,6 @@ sub setup_standard {
                debug(gettext("refreshing wiki.."));
        }
 
-       loadplugins();
-       checkconfig();
        lockwiki();
        loadindex();
        refresh();