X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3d4c32dacefaf83367215c59e35293144a9f2fe7..c755bfd1d88f52a6b4b0e1eef6f2aae0da705fb7:/simple.setup

diff --git a/simple.setup b/simple.setup
index 7c2e635c8..60934b5f6 100644
--- a/simple.setup
+++ b/simple.setup
@@ -6,7 +6,7 @@
 #
 # Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
 #
-# By default, it asks two questions, and confines itself to the user's home
+# 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
 # modify the values to use site-specific settings.
 
@@ -16,15 +16,18 @@ our $wikiname=IkiWiki::Setup::Automator::ask(
 	"What will the wiki be named?", "wiki");
 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;
 
-IkiWiki::Setup::Automator::import(
+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",
-	setupfile => "$ENV{HOME}/$wikiname.setup",
+	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",