X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=auto-blog.setup;h=0eb83ded614a2b4e2b2397bf8d2db897984317db;hp=ef03295d68bf5c9c4d3b93c208c17a346be5ad38;hb=71974c24bbd31e4295b366eeea245131e8a9dc21;hpb=d7c164dbf29ef57f8ed2963985bd250acbef96df

diff --git a/auto-blog.setup b/auto-blog.setup
index ef03295d6..0eb83ded6 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -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}],
 	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",
 )