Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index e3059e32e6642fbedaedfb66d3b85ad203fbd29e..ef03295d68bf5c9c4d3b93c208c17a346be5ad38 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 blogspam}],
+       add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}],
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,
@@ -46,6 +46,9 @@ IkiWiki::Setup::Automator->import(
        example => "blog",
        comments_pagespec => "posts/* and !*/Discussion",
        blogspam_pagespec => "postcomment(*)",
+       archive_pagespec => "posts/* and !*/Discussion",
+       global_sidebars => 0,
        discussion => 0,
        locked_pages => "*",
+       tagbase => "tags",
 )