From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 20:52:41 +0000 (-0400)
Subject: Enable calendar and sidebar in auto-blog.setup.
X-Git-Tag: 3.20100427~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adbbd014dc76f334ed897f6801afa4cb0b483864;p=ikiwiki.git

Enable calendar and sidebar in auto-blog.setup.
---

diff --git a/auto-blog.setup b/auto-blog.setup
index 0a2a81bf7..ff52befa3 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}],
+	add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
diff --git a/debian/changelog b/debian/changelog
index 267a2fd7a..af19f4a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * CSS and templates for sidebar changed to use a class, not an id.
   * sidebar: Now a sidebar directive can be used to override the sidebar
     shown on a page.
+  * Enable calendar and sidebar in auto-blog.setup.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400