X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8051316904d13de3e467f01ebaeacaa5d8efb1b6..82f0facb620e59594aaf318c2eaf676c7788f1e6:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2f274f384..a138ac8bf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -82,11 +82,26 @@ sub getsetup () { #{{{
 	cgiurl => {
 		type => "string",
 		default => '',
-		examples => "http://example.com/wiki/ikiwiki.cgi",
+		example => "http://example.com/wiki/ikiwiki.cgi",
 		description => "url to the ikiwiki.cgi",
 		safe => 1,
 		rebuild => 1,
 	},
+	cgi_wrapper => {
+		type => "string",
+		default => '',
+		example => "/var/www/wiki/ikiwiki.cgi",
+		description => "cgi executable to generate",
+		safe => 0, # file
+		rebuild => 0,
+	},
+	cgi_wrappermode => {
+		type => "string",
+		default => '06755',
+		description => "mode for cgi_wrapper (can safely be made suid)",
+		safe => 0,
+		rebuild => 0,
+	},
 	rcs => {
 		type => "string",
 		default => '',
@@ -117,27 +132,6 @@ sub getsetup () { #{{{
 		safe => 1,
 		rebuild => 1,
 	},
-	wrappers => {
-		type => "string",
-		default => undef,
-		description => "definitions of wrappers to generate",
-		safe => 0,
-		rebuild => 0,
-	},
-	wrapper => {
-		type => "internal",
-		default => undef,
-		description => "wrapper filename",
-		safe => 0,
-		rebuild => 0,
-	},
-	wrappermode => {
-		type => "internal",
-		default => undef,
-		description => "mode of wrapper file",
-		safe => 0,
-		rebuild => 0,
-	},
 	templatedir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/templates",
@@ -152,6 +146,13 @@ sub getsetup () { #{{{
 		safe => 0, # path
 		rebuild => 0,
 	},
+	wrappers => {
+		type => "internal",
+		default => [],
+		description => "wrappers to generate",
+		safe => 0,
+		rebuild => 0,
+	},
 	underlaydirs => {
 		type => "internal",
 		default => [],