Reference CVE-2016-4561 in 3.20160506 changelog

[git.ikiwiki.info.git] / auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index 980074ec3affe8a7426586166903a1c9884361ed..8bc00217c541cd249a5ff7405c13f4a93f64987e 100644 (file)
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -5,7 +5,7 @@
 # check it into revision control, generate a setup file for the new
 # wiki, and set everything up.
 #
-# Just run: ikiwiki -setup /etc/ikiwiki/auto-blog.setup
+# Just run: ikiwiki --setup /etc/ikiwiki/auto-blog.setup
 #
 # By default, it asks a few questions, and confines itself to the user's home
 # directory. You can edit it to change what it asks questions about, or to
@@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import(
        cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
        cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
        adminemail => "$ENV{USER}\@$domain",
-       add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}],
+       add_plugins => [qw{goodstuff websetup comments blogspam calendar sidebar trail}],
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,
@@ -49,6 +49,6 @@ IkiWiki::Setup::Automator->import(
        archive_pagespec => "page(posts/*) and !*/Discussion",
        global_sidebars => 0,
        discussion => 0,
-       locked_pages => "*",
+       locked_pages => "* and !postcomment(*)",
        tagbase => "tags",
 )