summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auto-blog.setup4
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 2 deletions
diff --git a/auto-blog.setup b/auto-blog.setup
index 980074ec3..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,
@@ -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 5433ba05f..9e6bd53f0 100644
--- 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