Enable calendar and sidebar in auto-blog.setup.

diff --git a/auto-blog.setup b/auto-blog.setup
index 0a2a81bf72ecbb7be616518ff54b79d226a2bbee..ff52befa3b70e268a3c17e8e09092b111e75dec5 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 opendiscussion blogspam calendar}],
+       add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}],

        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 267a2fd7aa5b604479d2c6ffd0adfaccb6142d93..af19f4a009aec0a294f301cf9b9879f0612ef12f 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400