diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-21 22:48:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-08-21 22:48:07 -0400 |
| commit | 888f4203f5a228005a15b70f962b7e7f16de9ad3 (patch) | |
| tree | 12ad3d29aef5d28f84778a1feb8386bb53673d36 /auto.setup | |
| parent | a98bfb05c066fcc0454b8904b881a22f879ab2b6 (diff) | |
| download | ikiwiki-888f4203f5a228005a15b70f962b7e7f16de9ad3.tar ikiwiki-888f4203f5a228005a15b70f962b7e7f16de9ad3.tar.gz | |
Avoid using hostname -f for portability to eg, OS X, use Net::Domain instead, and prompt if it fails.
Diffstat (limited to 'auto.setup')
| -rw-r--r-- | auto.setup | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/auto.setup b/auto.setup index 3b8d92365..47d0d868f 100644 --- a/auto.setup +++ b/auto.setup @@ -18,7 +18,9 @@ our $rcs=IkiWiki::Setup::Automator::ask( "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; +use Net::Domain q{hostfqdn}; +our $domain=hostfqdn() || ikiwiki::setup::automator::ask( + "What is the domain name of the web server?", ""); IkiWiki::Setup::Automator->import( wikiname => $wikiname, @@ -28,10 +30,10 @@ IkiWiki::Setup::Automator->import( 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", + 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", |