changelog

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

diff --git a/auto-blog.setup b/auto-blog.setup
index 3ef734b39a41a9213cccd4ec5e5f71f2aed2b3a2..0eb83ded614a2b4e2b2397bf8d2db897984317db 100644 (file)
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -15,27 +15,28 @@ require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
        gettext("What will the blog be named?"), gettext("blog"));
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
        gettext("What will the blog be named?"), gettext("blog"));

+our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);

 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
        gettext("What wiki user (or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 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(
        wikiname => $wikiname,
        adminuser => [$admin],
        rcs => $rcs,
        gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
        wikiname => $wikiname,
        adminuser => [$admin],
        rcs => $rcs,

-       srcdir => "$ENV{HOME}/$wikiname",
-       destdir => "$ENV{HOME}/public_html/$wikiname",
-       repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
-       dumpsetup => "$ENV{HOME}/$wikiname.setup",
-       url => "http://$domain/~$ENV{USER}/$wikiname",
-       cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
-       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+       srcdir => "$ENV{HOME}/$wikiname_short",
+       destdir => "$ENV{HOME}/public_html/$wikiname_short",
+       repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+       dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
+       url => "http://$domain/~$ENV{USER}/$wikiname_short",
+       cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
+       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",

        adminemail => "$ENV{USER}\@$domain",
        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,
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,


@@ -45,5 +46,9 @@ IkiWiki::Setup::Automator->import(
        example => "blog",
        comments_pagespec => "posts/* and !*/Discussion",
        blogspam_pagespec => "postcomment(*)",
        example => "blog",
        comments_pagespec => "posts/* and !*/Discussion",
        blogspam_pagespec => "postcomment(*)",

+       archive_pagespec => "page(posts/*) and !*/Discussion",
+       global_sidebars => 0,

        discussion => 0,
        discussion => 0,

+       locked_pages => "* and !postcomment(*)",
+       tagbase => "tags",

 )
 )