Changeset 1683 in ProjectBuilder

Timestamp:

Jan 3, 2013, 5:02:53 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix tar build to include also common files
• Use ssh instead of Net:SSH2 to lauch the final setup script as it wasn't working for a reason
• Use sudo to lauch these scripts, which require norequiretty fin sudoers for the account used

Location:

projects/casparbuster/devel

Files:

• bin/cb (modified) (7 diffs)
• lib/CasparBuster/SSH.pm (modified) (2 diffs)

projects/casparbuster/devel/bin/cb

@@ -350 +350 @@
 
 my $tar = Archive::Tar->new;
-$tar->setcwd($tdir);
 my $curdate = time();
 foreach my $k (keys %{$cbp}) {
@@ -357 +356 @@
         foreach my $o ((keys %{$cbp->{$k}->{$type}})) {
             if ((defined $force) || (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'})) {
-                $tar->add_files("$o");
+                if ( -r "$tdir/$o" ) {
+                    pb_log(1,"INFO: Adding to the tar file $tdir/$o\n");
+                    chdir($tdir);
+                    $tar->add_files("$o");
+                } else {
+                    # It's in the common place instead
+                    foreach my $c (keys $cb->{'commondir'}) {
+                        if (-r "$dest/$c/$o") {
+                            pb_log(1,"INFO: Adding to the tar file $dest/$c/$o\n");
+                            chdir("$dest/$c");
+                            $tar->add_files("$o");
+                        }
+                    }
+                }
                 # Add an entry to the DB
                 if (defined $dbid->{$o}) {
@@ -397 +409 @@
 $ssh2 = cb_ssh_init($remote,$mach,$debug);
 
-$ssh2->scp_put($tarfile,$tarfile);
+if (!($ssh2->scp_put($tarfile,$tarfile))) {
+    my @error = $ssh2->error();
+    print "@error\n";
+    confess "Unable to copy tar file $tarfile to $mach\n";
+}
 pb_log(0,"INFO: Copying content under $ENV{'PBTMP'} on $remote\@$mach\n");
 
@@ -404 +420 @@
 if ((defined $cb->{'commondir'}) && (defined $cb->{'commondir'}->{$machine})) {
     $path = $cb->{'webdir'}->{$machine};
-    $tbextract = $cb->{'commondir'}->{$machine};
+    #$tbextract = $cb->{'commondir'}->{$machine};
 }
 $chan = $ssh2->channel();
@@ -410 +426 @@
 
 if (not $debug) {
+    # Reminder: sudo should be configured for this account as Defaults !requiretty for this to work
     print $chan "sudo tar -C $path -x -f $tarfile $tbextract\n";
     pb_log(0,"WARNING: $_\n") while (<$chan>);
@@ -440 +457 @@
     if (defined $cbp->{$k}->{'reloadscript'}) {
         if (not $debug) {
-            print $chan "$cbp->{$k}->{'reloadscript'}\n";
+            print $chan "sudo $cbp->{$k}->{'reloadscript'}\n";
         }
-        pb_log(0,"INFO: Executing (on $mach) $cbp->{$k}->{'reloadscript'}\n");
-    }
+        pb_log(0,"INFO: Executing (on $mach) $cbp->{$k}->{'reloadscript'} as root\n");
+    }
+}
+
+pb_log(0,"INFO: Executing (on $mach) /usr/local/bin/mk$mach if present as root\n");
+if (not $debug) {
+        # Using Net::SSH2 here was not working (due to the shell ?)
+        pb_system("ssh $remote\@$mach \"sudo /usr/local/bin/mk$mach\"","WAIT: Executing (on $mach) /usr/local/bin/mk$mach if present as root","verbose");
 }
 
@@ -450 +473 @@
     print $chan "rm -rf $ENV{'PBTMP'}\n";
 } else {
-    pb_log(1,"Remove remote directory $ENV{'PBTMP'} on $mach\n");
+    pb_log(1,"INFO: Please remove remote directory $ENV{'PBTMP'} on $mach\n");
 }
 $chan->close();

projects/casparbuster/devel/lib/CasparBuster/SSH.pm

@@ -63 +63 @@
 pb_log(3,"DEBUG: New SSH2 object created\n");
 $ssh2->debug(1) if ($debug > 2);
-pb_log(3,"DEBUG: SSH2 debug mode on\n");
+pb_log(3,"DEBUG: SSH2 debug mode on\n") if ($debug > 2);
 
 $ssh2->connect($machine) || confess "Unable to connect to $remote\@$machine: $!";
@@ -77 +77 @@
 
 $chan->exec("mkdir -p $ENV{'PBTMP'}");
-pb_log(3,"DEBUG: Created $ENV{'PBTMP'} on $remote\@$machine\n");
+pb_log(1,"DEBUG: Created $ENV{'PBTMP'} on $remote\@$machine\n");
 $chan->close;