X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e4d9da55d923cdd78cd07959de44edf17a9a5fe5..47d179802d5f78365fa7077ae64de35f2892a1e4:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 76213b11a..f67c3829b 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,8 +1,7 @@ #!/usr/bin/perl # Standard ikiwiki setup module. # Parameters to import should be all the standard ikiwiki config stuff, -# plus hashes for cgiwrapper and svnwrapper, which specify any differing -# config stuff for them and cause the wrappers to be made. +# plus an array of wrappers to set up. package IkiWiki::Setup::Standard; @@ -10,26 +9,7 @@ use warnings; use strict; sub import { - my %setup=%{$_[1]}; - - ::debug("generating wrappers.."); - foreach my $wrapper (@{$setup{wrappers}}) { - %::config=(%::config, verbose => 0, %setup, %{$wrapper}); - ::checkoptions(); - ::gen_wrapper(); - } - - ::debug("rebuilding wiki.."); - foreach my $c (keys %setup) { - $::config{$c}=::possibly_foolish_untaint($setup{$c}) - if defined $setup{$c} && ! ref $setup{$c}; - } - $::config{rebuild}=1; - ::checkoptions(); - ::refresh(); - - ::debug("done"); - ::saveindex(); + $IkiWiki::Setup::raw_setup=$_[1]; } 1