diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 21:00:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 21:00:11 -0400 |
| commit | c83fd4a32868d46765a88f6903dd807f18c9ae84 (patch) | |
| tree | 8caffbf1eee77601014d4e58833e74e5cc55891c /IkiWiki/Setup.pm | |
| parent | 4604fadf0acb92ec3e64092bcd9e76eae93b93b2 (diff) | |
| download | ikiwiki-c83fd4a32868d46765a88f6903dd807f18c9ae84.tar ikiwiki-c83fd4a32868d46765a88f6903dd807f18c9ae84.tar.gz | |
wrapper setup reorg
Flattened the wrapper setup, as this lets it be handled better by the
setup generation code.
Diffstat (limited to 'IkiWiki/Setup.pm')
| -rw-r--r-- | IkiWiki/Setup.pm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 262d49479..92f1eadb5 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -48,7 +48,13 @@ sub load ($) { # {{{ $config{$c}=IkiWiki::possibly_foolish_untaint($setup{$c}); } elsif (ref $setup{$c} eq 'ARRAY') { - $config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}] + if ($c eq 'wrappers') { + # backwards compatability code + $config{$c}=$setup{$c}; + } + else { + $config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}] + } } elsif (ref $setup{$c} eq 'HASH') { foreach my $key (keys %{$setup{$c}}) { @@ -60,6 +66,14 @@ sub load ($) { # {{{ $config{$c}=undef; } } + + if (exists $config{cgi_wrapper}) { + push @{$config{wrappers}}, { + cgi => 1, + wrapper => $config{cgi_wrapper}, + wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"), + }; + } } #}}} sub dump ($) { #{{{ |