From c83fd4a32868d46765a88f6903dd807f18c9ae84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 21:00:11 -0400
Subject: wrapper setup reorg

Flattened the wrapper setup, as this lets it be handled better by the
setup generation code.
---
 IkiWiki/Setup.pm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Setup.pm')

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 ($) { #{{{
-- 
cgit v1.2.3