summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm54
1 files changed, 27 insertions, 27 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5724518da..4410fc985 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -94,10 +94,26 @@ sub getsetup () { #{{{
safe => 0, # don't allow overriding
rebuild => 0,
},
- discussion => {
- type => "boolean",
- default => 1,
- description => "enable Discussion pages?",
+ default_plugins => {
+ type => "internal",
+ default => [qw{mdwn link inline htmlscrubber passwordauth
+ openid signinedit lockedit conditional
+ recentchanges parentlinks}],
+ 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,
},
@@ -171,6 +187,13 @@ sub getsetup () { #{{{
safe => 0, # changing requires manual transition
rebuild => 1,
},
+ discussion => {
+ type => "boolean",
+ default => 1,
+ description => "enable Discussion pages?",
+ safe => 1,
+ rebuild => 1,
+ },
default_pageext => {
type => "string",
default => "mdwn",
@@ -319,29 +342,6 @@ sub getsetup () { #{{{
safe => 0,
rebuild => 0,
},
- default_plugins => {
- type => "internal",
- default => [qw{mdwn link inline htmlscrubber passwordauth
- openid signinedit lockedit conditional
- recentchanges parentlinks}],
- 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 => {
type => "internal",
default => undef,