Changeset 346 in ProjectBuilder for devel/pb/bin

Timestamp:

Apr 2, 2008, 2:04:21 AM (17 years ago)

Author:

Bruno Cornec

Message:

First attempt to code a setupvm/ve function into pb

File:

• devel/pb/bin/pb (modified) (9 diffs)

devel/pb/bin/pb

@@ -202 +202 @@
 
 Create a new virtual environment
+
+=item B<setupvm>
+
+Setup a virtual machine for pb usage
+
+=item B<setupve>
+
+Setup a virtual environment for pb usage
 
 =item B<newver>
@@ -422 +430 @@
 } elsif ($action =~ /^newvm$/) {
     pb_launchv("vm",$ENV{'PBV'},1);
+} elsif ($action =~ /^setupve$/) {
+    $pbaccount = "root";
+    my $pbscript = pb_setup_v("ve");
+    pb_script2v($pbscript,"ve");
+} elsif ($action =~ /^setupvm$/) {
+    $pbaccount = "root";
+    my $pbscript = pb_setup_v("vm");
+    pb_script2v($pbscript,"vm");
 } elsif ($action =~ /^newproj$/) {
     # Nothing to do - already done in pb_env_init
@@ -1216 +1232 @@
 }
 
-sub pb_setup_v {
 # Function to create a potentialy missing pb account on the VM/VE, and adds it to sudo
 # Needs to use root account to connect to the VM/VE
-
 # pb will take your local public SSH key to access
-# the pb account in the VM later on
+# the pb account in the VM later on if needed
+sub pb_setup_v {
 
 my $vtype = shift;
 
-my $file = "$ENV{'HOME'}/.ssh/id_dsa.pub";
-die "Unable to find your public ssh key as $file";
-
-open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+# Script generated
+my $pbscript = "$ENV{'PBDESTDIR'}/setupv";
+
+# Name of the account to deal with for VM/VE
+my $pbaccount = pb_conf_get($vtype."login");
+
+# Prepare the script to be executed on the VM/VE
+# in $ENV{'PBDESTDIR'}/setupv
+
+# Check the SSH environment
+my $file = undef;
+$file = "$ENV{'HOME'}/.ssh/id_rsa.pub" if (-s "$ENV{'HOME'}/.ssh/id_rsa.pub");
+$file = "$ENV{'HOME'}/.ssh/id_dsa.pub" if (-s "$ENV{'HOME'}/.ssh/id_dsa.pub");
+die "Unable to find your public ssh key under $file" if (not defined $file);
+
+open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
 print SCRIPT << 'EOF';
 #!/usr/bin/perl -w
 
-$file="/etc/passwd";
+use strict;
+use File::Copy;
+
+my $file="/etc/passwd";
 open(PBFILE,$file) || die "Unable to open $file";
 my $found = 0;
 while (<PBFILE>) {
-    $found = 1 if (/^pb:/);
+EOF
+print SCRIPT << "EOF"
+    \$found = 1 if (/^$pbaccount:/);
+EOF
+print SCRIPT << 'EOF';
 }
 close(PBFILE);
@@ -1244 +1278 @@
         mkdir "/home";
     }
-    system "groupadd pb";
-    system "useradd pb -g pb -m -d /home/pb";
+EOF
+print SCRIPT << "EOF"
+system "groupadd $pbaccount";
+system "useradd $pbaccount -g $pbaccount -m -d /home/$pbaccount";
+
+# For pb
+chdir "/home/$pbaccount";
+mkdir ".ssh",0700;
+copy("/tmp/pbkey",".ssh/authorized_keys");
+chmod 0600,".ssh/authorized_keys";
+system 'chown -R $pbaccount:$pbaccount .ssh';
+
+EOF
+print SCRIPT << 'EOF';
 }
 
 # For root
 mkdir ".ssh",0700;
-system 'cp /tmp/pbkey .ssh/authorized_keys';
+copy("/tmp/pbkey",".ssh/authorized_keys");
 chmod 0600,".ssh/authorized_keys";
-
-# For pb
-chdir "/home/pb";
-mkdir ".ssh",0700;
-system 'cp /tmp/pbkey .ssh/authorized_keys';
-chmod 0600,".ssh/authorized_keys";
-system 'chown -R pb:pb .ssh';
 
 # No passwd for pb only keys
@@ -1265 +1304 @@
 open(PBOUT,"> $file.new") || die "Unable to open $file.new";
 while (<PBFILE>) {
-    s/^pb:\!\!:/pb:*:/;
-    s/^pb:\!:/pb:*:/;   #SLES 9 e.g.
+EOF
+print SCRIPT << "EOF"
+    s/^$pbaccount:\!\!:/$pbaccount:*:/;
+    s/^$pbaccount:\!:/$pbaccount:*:/;   #SLES 9 e.g.
+EOF
+print SCRIPT << 'EOF'
     print PBOUT $_;
 }
@@ -1277 +1320 @@
 unlink "/tmp/pbkey";
 
+# Adapt sudoers
+$file="/etc/sudoers";
+open(PBFILE,$file) || die "Unable to open $file";
+open(PBOUT,"> $file.new") || die "Unable to open $file.new";
+while (<PBFILE>) {
+EOF
+print SCRIPT << "EOF"
+    next if (/^$pbaccount   /);
+EOF
+print SCRIPT << 'EOF'
+    s/Defaults[ \t]+requiretty//;
+    print PBOUT $_;
+}
+close(PBFILE);
+EOF
+print SCRIPT << "EOF"
+# This is needed in order to be able to halt the machine from the $pbaccount account at least
+print PBOUT "$pbaccount   ALL=(ALL) NOPASSWD:ALL\n";
+EOF
+print SCRIPT << 'EOF'
+close(PBOUT);
+rename("$file.new",$file);
+chmod 0440,$file;
+
+EOF
+
+pb_install_pkg_deps(SCRIPT);
+
+print SCRIPT << 'EOF';
+# Suse wants sudoers as 640
+if (($ddir eq "sles") || (($ddir eq "suse")) && ($dver ne "10.3")) {
+    chmod 0640,$file;
+}
+
+# Sync date
+system "/usr/sbin/ntpdate ntp.pool.org";
+
+system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
+EOF
+close(SCRIPT);
+chmod 0755,"$pbscript";
+return($pbscript);
+}
+
+pb_install_pkg_deps {
+
+my \*SCRIPT = shift;
+
+print SCRIPT << 'EOF';
+# We need to have that pb_distro_init function
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
@@ -1283 +1376 @@
 if ( $ddir eq "fedora" ) {
     system "yum clean all";
-    system "yum update -y";
+    #system "yum update -y";
     my $arch=`uname -m`;
     my $opt = "";
@@ -1303 +1396 @@
 } elsif ( $dfam eq "du" ) {
     if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
-        system "apt-get update; apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libdate-manip-perl";
+        #system "apt-get update";
+        system "apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libdate-manip-perl";
     } else  {
         system "apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate rses5-dev libdate-manip-perl";
@@ -1312 +1406 @@
     print "No pkg to install\n";
 }
-
-# Adapt sudoers
-$file="/etc/sudoers";
-open(PBFILE,$file) || die "Unable to open $file";
-open(PBOUT,"> $file.new") || die "Unable to open $file.new";
-while (<PBFILE>) {
-    next if (/^pb   /);
-    s/Defaults[ \t]+requiretty//;
-    print PBOUT $_;
-}
-close(PBFILE);
-print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n";
-close(PBOUT);
-rename("$file.new",$file);
-chmod 0440,$file;
-
-# Suse wants sudoers as 640
-if (($ddir eq "sles") || (($ddir eq "suse")) && ($dver ne "10.3")) {
-    chmod 0640,$file;
-}
-
-# Sync date
-system "/usr/sbin/ntpdate ntp.pool.org";
-
-system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
 EOF
-close(SCRIPT);
 }