Extract add_and_commit(), a common test action.

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

diff --git a/auto-blog.setup b/auto-blog.setup
index cf77b3bf72c22bdcf5cc8375d25aebce77781a23..0eb83ded614a2b4e2b2397bf8d2db897984317db 100644 (file)
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -21,7 +21,7 @@ our $rcs=IkiWiki::Setup::Automator::ask(
 our $admin=IkiWiki::Setup::Automator::ask(
        gettext("What wiki user (or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
-our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
+our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask(
        gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
@@ -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 blogspam calendar sidebar}],
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,
@@ -46,5 +46,9 @@ IkiWiki::Setup::Automator->import(
        example => "blog",
        comments_pagespec => "posts/* and !*/Discussion",
        blogspam_pagespec => "postcomment(*)",
+       archive_pagespec => "page(posts/*) and !*/Discussion",
+       global_sidebars => 0,
        discussion => 0,
+       locked_pages => "* and !postcomment(*)",
+       tagbase => "tags",
 )