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

[ikiwiki.git] / auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index 3ef734b39a41a9213cccd4ec5e5f71f2aed2b3a2..cf77b3bf72c22bdcf5cc8375d25aebce77781a23 100644 (file)
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -15,6 +15,7 @@ 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(
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(


@@ -27,13 +28,13 @@ IkiWiki::Setup::Automator->import(
        wikiname => $wikiname,
        adminuser => [$admin],
        rcs => $rcs,
        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",
        add_plugins => [qw{goodstuff websetup comments blogspam}],
        disable_plugins => [qw{}],
        adminemail => "$ENV{USER}\@$domain",
        add_plugins => [qw{goodstuff websetup comments blogspam}],
        disable_plugins => [qw{}],