auto-blog.setup: Don't enable opendiscussion by default; require users be logged...

diff --git a/auto-blog.setup b/auto-blog.setup
index 980074ec3affe8a7426586166903a1c9884361ed..0eb83ded614a2b4e2b2397bf8d2db897984317db 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",
-       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,
@@ -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",
 )

diff --git a/debian/changelog b/debian/changelog
index 5433ba05f0541350dd03f959c57beeddafc07d27..9e6bd53f0edc93a76b062dd7a45a51d388526d57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
     of the monotone workspace. Thanks, tommyd.
   * img: If a class is specified, don't also put the img in the img
     class.
+  * auto-blog.setup: Don't enable opendiscussion by default; require users be
+    logged in to post comments.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400