X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c755bfd1d88f52a6b4b0e1eef6f2aae0da705fb7..219afc3f9c646f323c9a51744b6fba43f04786db:/IkiWiki/Setup/Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index af98c9847..ee83a2fcf 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -6,6 +6,7 @@ package IkiWiki::Setup::Automator;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
 
@@ -36,11 +37,11 @@ sub import (@) { #{{{
 	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
 		next unless exists $config{$key};
 		my $add="";
-		while (-e $config{$key}.$add) {
+		while (-e $add.$config{$key}) {
 			$add=1 if ! $add;
 			$add++;
 		}
-		$config{$key}.=$add;
+		$config{$key}=$add.$config{$key};
 	}
 
 	IkiWiki::checkconfig();
@@ -76,12 +77,50 @@ sub import (@) { #{{{
 	}
 	IkiWiki::Setup::dump($config{dumpsetup});
 
-	# Build the wiki.
+	# Build the wiki, but w/o wrappers, so it's not live yet.
 	mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
-	if (system("ikiwiki", "--setup", $config{dumpsetup}) != 0) {
-		die "ikiwiki --setup $config{dumpsetup} failed";
+	if (system("ikiwiki", "--refresh", "--setup", $config{dumpsetup}) != 0) {
+		die "ikiwiki --refresh --setup $config{dumpsetup} failed";
 	}
 
+	# Create admin user(s).
+	foreach my $admin (@{$config{adminuser}}) {
+		next if $admin=~/^http\?:\/\//; # openid
+		
+		# Prompt for password w/o echo.
+		system('stty -echo 2>/dev/null');
+		local $|=1;
+		print "\n\nCreating wiki admin $admin ...\n";
+		print "Choose a password: ";
+		chomp(my $password=<STDIN>);
+		print "\n\n\n";
+		system('stty sane 2>/dev/null');
+
+		if (IkiWiki::userinfo_setall($admin, { regdate => time }) &&
+		    IkiWiki::Plugin::passwordauth::setpassword($admin, $password)) {
+			IkiWiki::userinfo_set($admin, "email", $config{adminemail}) if defined $config{adminemail};
+		}
+		else {
+			error("problem setting up $admin user");
+		}
+	}
+	
+	# Add wrappers, make live.
+	if (system("ikiwiki", "--wrappers", "--setup", $config{dumpsetup}) != 0) {
+		die "ikiwiki --wrappers --setup $config{dumpsetup} failed";
+	}
+
+	# Add it to the wikilist.
+	mkpath("$ENV{HOME}/.ikiwiki");
+	open (WIKILIST, ">>$ENV{HOME}/.ikiwiki/wikilist") || die "$ENV{HOME}/.ikiwiki/wikilist: $!";
+	print WIKILIST "$ENV{USER} $config{dumpsetup}\n";
+	close WIKILIST;
+	if (system("ikiwiki-update-wikilist") != 0) {
+		print STDERR "** Failed to add you to the system wikilist file.\n";
+		print STDERR "** (Probably ikiwiki-update-wikilist is not SUID root.)\n";
+		print STDERR "** Your wiki will not be automatically updated when ikiwiki is upgraded.\n";
+	}
+	
 	# Done!
 	print "\n\nSuccessfully set up $config{wikiname}:\n";
 	foreach my $key (qw{url srcdir destdir repository}) {