Merge commit 'origin/master'

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

diff --git a/auto.setup b/auto.setup
index 3b8d923652591cb9fbccccb5835d2a9fd0961ec8..ef0f1723c9e48be1937ab9e1886a6074c405b15d 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -13,12 +13,14 @@
 require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
-       "What will the wiki be named?", "wiki");
+       gettext("What will the wiki be named?"), gettext("wiki"));
 our $rcs=IkiWiki::Setup::Automator::ask(
-       "What revision control system to use?", "git");
+       gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
-       "What wiki user (or openid) will be wiki admin?", $ENV{USER});
-our $hostname=`hostname -f`; chomp $hostname;
+       gettext("What wiki user (or openid) will be wiki 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?"), "");
 
 IkiWiki::Setup::Automator->import(
        wikiname => $wikiname,
@@ -26,12 +28,12 @@ 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://$hostname/~$ENV{USER}/$wikiname",
-       cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
+       url => "http://$domain/~$ENV{USER}/$wikiname",
+       cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
        cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
-       adminemail => "$ENV{USER}\@$hostname",
+       adminemail => "$ENV{USER}\@$domain",
        add_plugins => [qw{goodstuff websetup}],
        disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",