summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-30 14:36:40 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-30 14:44:50 -0400
commite12627e0a4c73d4d47ac2f10750defe22b41580e (patch)
tree34312543984db72b165d9fcf752207081ec63e2b
parent6c8a8dd13b96f2990f58596c7ec5e7c497b39cbe (diff)
update
-rw-r--r--IkiWiki.pm2
-rw-r--r--debian/changelog2
-rw-r--r--doc/todo/online_configuration.mdwn3
3 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad41215c1..6a6e93e7e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -115,7 +115,7 @@ sub getsetup () { #{{{
openid signinedit lockedit conditional
recentchanges parentlinks}],
description => "plugins to enable by default",
- safe => 1,
+ safe => 0,
rebuild => 1,
},
add_plugins => {
diff --git a/debian/changelog b/debian/changelog
index c4e4b7f48..4954c7737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
ikiwiki (2.60) UNRELEASED; urgency=low
* Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
- can be used set up a new wiki in seconds.
+ can be used create a new wiki in seconds.
* Add getsetup hook, all plugins that add fields to %config should use it.
* ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
current configuration.
diff --git a/doc/todo/online_configuration.mdwn b/doc/todo/online_configuration.mdwn
index 2393b75af..584eb1dd2 100644
--- a/doc/todo/online_configuration.mdwn
+++ b/doc/todo/online_configuration.mdwn
@@ -22,6 +22,9 @@ The plugin could have these config options:
websetup_include => [qw{safe}],
# list of options to exclude from web setup
websetup_exclude => [qw{option_baz}],
+ # list of plugins that cannot be enabled/disabled via the web
+ # interface
+ websetup_unconfigurable_plugins => [qw{}]
Leaning toward just making it write out to the same setup file, rather than
writing to a subsidiary setup file. However, this would mean that any