changelog

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6a72a0144e9da40c7cd00a6f2ec09fe8835fd085..edbec77d62ed55f977f97c6f8b476d06c65c6676 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -116,7 +116,7 @@ sub getsetup () { #{{{
        discussion => {
                type => "boolean",
                default => 1,
-               description => "enable Discussion pages",
+               description => "enable Discussion pages?",
                safe => 1,
                rebuild => 1,
        },
@@ -142,6 +142,27 @@ sub getsetup () { #{{{
                safe => 0, # paranoia
                rebuild => 0,
        },
+       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",
@@ -166,14 +187,14 @@ sub getsetup () { #{{{
        verbose => {
                type => "boolean",
                default => 0,
-               description => "display verbose messages when building",
+               description => "display verbose messages when building?",
                safe => 1,
                rebuild => 0,
        },
        syslog => {
                type => "boolean",
                default => 0,
-               description => "log to syslog",
+               description => "log to syslog?",
                safe => 1,
                rebuild => 0,
        },
@@ -245,11 +266,19 @@ sub getsetup () { #{{{
        hardlink => {
                type => "boolean",
                default => 0,
-               description => "attempt to hardlink source files (optimisation for large files)",
+               description => "attempt to hardlink source files? (optimisation for large files)",
                safe => 0, # paranoia
                rebuild => 0,
        },
 
+       exclude => {
+               type => "string",
+               default => undef,
+               example => '\.wav$',
+               description => "regexp of source files to ignore",
+               safe => 0, # regexp
+               rebuild => 1,
+       },
        wiki_file_prune_regexps => {
                type => "internal",
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
@@ -324,20 +353,6 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
-       wrapper => {
-               type => "internal",
-               default => undef,
-               description => "wrapper file to generate",
-               safe => 0,
-               rebuild => 0,
-       },
-       wrappermode => {
-               type => "internal",
-               default => undef,
-               description => "mode of wrapper file",
-               safe => 0,
-               rebuild => 0,
-       },
        setup => {
                type => "internal",
                default => undef,
@@ -345,13 +360,27 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
-       plugin => {
+       default_plugins => {
                type => "internal",
                default => [qw{mdwn link inline htmlscrubber passwordauth
                                openid signinedit lockedit conditional
                                recentchanges parentlinks}],
-               description => "enabled plugins",
-               safe => 0,
+               description => "plugins to enable by default",
+               safe => 1,
+               rebuild => 1,
+       },
+       add_plugins => {
+               type => "string",
+               default => [],
+               description => "plugins to add to the default configuration",
+               safe => 1,
+               rebuild => 1,
+       },
+       disable_plugins => {
+               type => "string",
+               default => [],
+               description => "plugins to disable",
+               safe => 1,
                rebuild => 1,
        },
        libdir => {
@@ -434,7 +463,7 @@ sub loadplugins () { #{{{
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }
 
-       loadplugin($_) foreach @{$config{plugin}};
+       loadplugin($_) foreach @{$config{default_plugins}}, @{$config{add_plugins}};
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {