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.pm | |
parent | 4604fadf0acb92ec3e64092bcd9e76eae93b93b2 (diff) |
wrapper setup reorg
Flattened the wrapper setup, as this lets it be handled better by the
setup generation code.
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index c7c5aaf97..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,33 +132,6 @@ sub getsetup () { #{{{ safe => 1, rebuild => 1, }, - wrappers => { - type => "string", - example => [ - { - cgi => 1, - wrapper => "/var/www/wiki/ikiwiki.cgi", - wrappermode => "06755", - }, - ], - 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", @@ -158,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 => [], |