X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bbb3a8aac760cf21ffb21a0bc779adc23de69943..c7bdebaaf134729356852918b387071c92f85e72:/auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index ef03295d6..8bc00217c 100644
--- 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,
@@ -46,9 +46,9 @@ IkiWiki::Setup::Automator->import(
 	example => "blog",
 	comments_pagespec => "posts/* and !*/Discussion",
 	blogspam_pagespec => "postcomment(*)",
-	archive_pagespec => "posts/* and !*/Discussion",
+	archive_pagespec => "page(posts/*) and !*/Discussion",
 	global_sidebars => 0,
 	discussion => 0,
-	locked_pages => "*",
+	locked_pages => "* and !postcomment(*)",
 	tagbase => "tags",
 )