bugfix

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

diff --git a/auto.setup b/auto.setup
index 38514d5549f24e8cca6e37422637937c9e4302dc..afb54b3241895db1315da23567ad242096ac85ea 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -4,7 +4,7 @@
 # This setup file causes ikiwiki to create a wiki, check it into revision
 # control, generate a setup file for the new wiki, and set everything up.
 #
-# Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
+# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup
 #
 # By default, it asks a few questions, and confines itself to the user's home
 # directory. You can edit it to change what it asks questions about, or to
@@ -13,31 +13,32 @@
 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 $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
 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("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?"), "");
 
 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",
-       dumpsetup => "$ENV{HOME}/$wikiname.setup",
-       url => "http://$hostname/~$ENV{USER}/$wikiname",
-       cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
-       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
-       adminemail => "$ENV{USER}\@$hostname",
-       add_plugins => [qw{ goodstuff }],
-       disable_plugins => [qw{  }],
+       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}],
+       disable_plugins => [qw{}],
        libdir => "$ENV{HOME}/.ikiwiki",
        rss => 1,
        atom => 1,
        syslog => 1,
-       prefix_directives => 1,
-       hardlink => 1,
 )