]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Setup/Standard.pm
web commit by AlexandreDupas: Added my self
[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm
index 1e65b23e3bf5a42e5e102a2bf331b39e933b6185..87db648e0accc2c177f2f55e8c6dc712863a0326 100644 (file)
@@ -24,12 +24,6 @@ sub setup_standard {
                push @{$setup{plugin}}, @{$setup{add_plugins}};
                delete $setup{add_plugins};
        }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
-       }
        if (exists $setup{exclude}) {
                push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }
@@ -40,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});