(no commit message)

[ikiwiki.git] / auto.setup

diff --git a/auto.setup b/auto.setup
index 74879dbc51047fb66db08027cf02e9f8a2c1d737..b3d2513d9ec7cd2903af8f8d0f7e27bca6d16535 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -17,7 +17,7 @@ our $wikiname=IkiWiki::Setup::Automator::ask(
 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 wiki admin?"), $ENV{USER});
+       gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER});
 use Net::Domain q{hostfqdn};
 our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
        gettext("What is the domain name of the web server?"), "");
@@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
        rcs => $rcs,
        srcdir => "$ENV{HOME}/$wikiname",
        destdir => "$ENV{HOME}/public_html/$wikiname",
-       repository => "$ENV{HOME}/$wikiname.$rcs",
+       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",
@@ -40,6 +40,4 @@ IkiWiki::Setup::Automator->import(
        rss => 1,
        atom => 1,
        syslog => 1,
-       prefix_directives => 1,
-       hardlink => 1,
 )