From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 21:20:03 +0000 (-0500)
Subject: add opendiscussion to auto-blog.setup
X-Git-Tag: 3.20100212~55
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/caa5db6c54c5c6368d511214961e749f5451379c?ds=sidebyside

add opendiscussion to auto-blog.setup
---

diff --git a/auto-blog.setup b/auto-blog.setup
index e3059e32e..7ff413187 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 blogspam}],
+	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
diff --git a/debian/changelog b/debian/changelog
index a65592277..794dec418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     ikiwiki.cgi?do=register
   * Improve display of openid in preferences page.
   * Add link to userpage (or creation link) to top of preferences page.
-  * auto-blog.setup: Lock all pages, so only admin can post to the blog
-    by default.
   * opendiscussion: This plugin will also now allow posting comments
     to otherwise locked-down sites. 
+  * auto-blog.setup: Lock all pages, so only admin can post to the blog
+    by default, and enable opendiscussion so others can comment.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500