--- trunk/vz-create.pl	2007/01/07 23:25:19	10
+++ trunk/vz-create.pl	2008/02/08 21:45:37	38
@@ -3,37 +3,57 @@
 # Dobrica Pavlinusic <dpavlin@rot13.org> 2007-01-07
 # 
 use strict;
-use Shell qw/host mkdir vzsplit rm/;
+use Shell qw/mkdir vzsplit rm/;
 use IO::Prompt;
 use Regexp::Common qw/net/;
+use lib 'lib';
+use VZ;
 
 # default debian distribution
 my $dist = 'etch';
 # debian mirror to use
-my $debian_mirror_uri = 'http://debian.carnet.hr/debian';
+my $debian_mirror_uri = 'http://www.debian.org/debian';
+my $arh = 'i386';
 # split physicial machine in how meny virtual ones?
-my $ve_total = 2;
+my $ve_total = 4;
 # swap size (Mb)
 my $swap_size = 512;
 # diskspace
 my $diskspace = '2G:4G';
 
-print "Creating new OpenVZ instance...\n";
+$dist = 'testing';
+$arh = 'amd64';
+
+check_root;
 
-my $arg = shift @ARGV || '';
+my $config_file = $0;
+$config_file =~ s!-create.pl!-tools.conf!;
+warn "## $config_file\n";
+if (-e $config_file) {
+	open(my $fh, '<', $config_file) || die "can't open $config_file: $!";
+	eval join("\n", <$fh>);
+	close($fh);
+	die "Error in $config_file: $@" if ($@);
+}
+
+print "Creating new OpenVZ instance...\n";
 
 my ($hostname, $ip) = ('localhost','');
 
-if ($arg =~ m/$RE{net}{IPv4}/) {
-	$ip = $arg;
-	chomp($hostname);
-	$hostname = host($arg);
-	$hostname =~ s/^.*\s(\S+)$/$1/;
-} elsif ($arg) {
-	$hostname = $arg;
-	$ip = host($arg);
-	chomp($ip);
-	$ip =~ s/^.*\s(\S+)$/$1/;
+foreach my $arg ( @ARGV ) {
+
+	if ($arg =~ m/$RE{net}{IPv4}/) {
+		$ip = $arg;
+		if ( my $h = hostname2ip($arg) ) {
+			$hostname = $h;
+		}
+	} elsif ($arg) {
+		if ( my $addr = hostname2ip($arg) ) {
+			( $hostname, $ip ) = ( $arg, $addr );
+		} else {
+			$hostname = $arg;
+		}
+	}
 }
 
 $ip ||= prompt('Enter IP: ', -require => {
@@ -44,7 +64,7 @@
 
 my @ip_split = split(/\./,$ip);
 
-my $ve_id = sprintf('%03d%03d', $ip_split[2], $ip_split[3]);
+my $ve_id = sprintf('%d%03d', $ip_split[2], $ip_split[3]);
 
 my $vz_root = '/vz';
 
@@ -56,11 +76,11 @@
 
 mkdir('-p', "$vz_root/root/$ve_id", "$vz_root/private/$ve_id");
 
-warn ">> installing debian\n";
+warn ">> installing debian $dist $arh from $debian_mirror_uri\n";
 
 if (! -e "$vz_root/private/$ve_id/etc/debian_version") {
 
-	my $debootstrap = "debootstrap --arch i386 $dist $vz_root/private/$ve_id $debian_mirror_uri";
+	my $debootstrap = "debootstrap --arch $arh $dist $vz_root/private/$ve_id $debian_mirror_uri";
 	warn "# $debootstrap\n";
 	system($debootstrap);
 
@@ -82,11 +102,13 @@
 } else {
 	vzsplit('-n', $ve_total, '-s', $swap_size * 1024, '>', $conf_path);
 
+	die "configuration file not created" unless -e $conf_path;
+
 	open(my $tmp, '>>', $conf_path) || die "can't open $conf_path: $!";
 	print $tmp "OSTEMPLATE=debian-3.1\n";
 	close($tmp);
 
-	vzctl('set', $ve_id, '--applyconfig', 'vps.basic', '--save');
+#	vzctl('set', $ve_id, '--applyconfig', 'vps.basic', '--save');
 	vzctl('set', $ve_id, '--ipadd', $ip, '--save');
 	vzctl('set', $ve_id, '--hostname', $hostname, '--save');
 	vzctl('set', $ve_id, '--diskspace', $diskspace, '--save');
@@ -107,7 +129,7 @@
 	"deb $debian_mirror_uri $dist main contrib non-free\n"
 );
 
-vzctl('start', $ve_id, '--wait');
+vzctl('start', $ve_id);
 
 my $customize_sh = <<'__END_OF_SH__';
 
@@ -115,17 +137,18 @@
 pwconv
 
 # upgrade to lastest version
-apt-get update
-apt-get upgrade
+apt-get -y update
+apt-get -y upgrade
 
 # install additional packages
-apt-get -y install vim less ssh sudo screen telnet finger
+apt-get -y --force-yes install vim less ssh sudo screen telnet finger
 
 # remove unwanted packages
 apt-get -y remove nano
 
 # apt-iselect helper
-wget -O /usr/local/bin/apt-iselect http://www.rot13.org/~dpavlin/projects/scripts/apt-iselect && chmod 755 /usr/local/bin/apt-iselect
+wget -t 1 -T 5 -O /usr/local/bin/apt-iselect http://www.rot13.org/~dpavlin/projects/scripts/apt-iselect
+chmod 755 /usr/local/bin/apt-iselect
 
 # lock root user
 usermod -L root
@@ -169,3 +192,12 @@
 
 #vzctl('stop', $ve_id);
 
+my $passwd = prompt('root passwd: ', -echo=>'*');
+vzctl('set', $ve_id, '--userpasswd', 'root:' . $passwd ) if ($passwd);
+
+my $login = prompt('create login: ');
+if ($login) {
+	$passwd = prompt("$login passwd: ", -echo=>'*');
+	vzctl('exec', $ve_id, "useradd --create-home $login");
+	vzctl('set', $ve_id, '--userpasswd', "$login:$passwd" );
+}