X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1916afc60321a420545d65929974ea06491dde85..888f4203f5a228005a15b70f962b7e7f16de9ad3:/auto.setup

diff --git a/auto.setup b/auto.setup
index 38514d554..47d0d868f 100644
--- 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
@@ -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,12 +30,12 @@ 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",
-	add_plugins => [qw{ goodstuff }],
-	disable_plugins => [qw{  }],
+	adminemail => "$ENV{USER}\@$domain",
+	add_plugins => [qw{goodstuff websetup}],
+	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
 	atom => 1,