add opendiscussion to auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index e3059e32e6642fbedaedfb66d3b85ad203fbd29e..7ff4131878e499a4925c25a93354eb77295f45d7 100644 (file)
--- 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",
        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,
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,

diff --git a/debian/changelog b/debian/changelog
index a65592277da98d0287dc35f84064bf23e6dd518d..794dec41855150ad1e0628a5fc079cf34e07fa6b 100644 (file)
--- 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.
     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. 
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500