Changeset 1679 in ProjectBuilder for projects

Timestamp:

Nov 16, 2012, 9:07:07 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Start working on plugins

Location:

projects/casparbuster/devel

Files:

• bin/cb (modified) (3 diffs)
• bin/cbusterize (modified) (3 diffs)
• etc/cb/plugins/shorewall.conf (modified) (3 diffs)
• lib/CasparBuster/Plugin.pm (modified) (3 diffs)

projects/casparbuster/devel/bin/cb

@@ -281 +281 @@
     die "ERROR: Only able to handle files or dirs with option --source\n" if ((! -d $fullsource) && (! -f $fullsource));
 
-    # We should get uid/gid fro elsewhere as they're probably wrong locally
+    # We should get uid/gid from elsewhere as they're probably wrong locally
     $cbp->{"cb.source"}->{$type}->{$source}->{'uid'} = $uid;
     $cbp->{"cb.source"}->{$type}->{$source}->{'gid'} = $gid;
@@ -294 +294 @@
     $findtarget = "$dest/$machine";
     find(\&cb_add_to_cbp,($findtarget));
+    # And we also need all what is common, but not what is for the web side
+    foreach my $c (keys $cb->{'commondir'}) {
+        $findtarget = "$dest/$c";
+        opendir(DIR,"$findtarget") || die "Unable to open $dest/$c: $!";
+        foreach my $m (readdir(DIR)) {
+            next if ($m =~ /^\./);
+            next if ($m eq $cb->{'commondir'}->{$c});
+            find(\&cb_add_to_cbp,("$findtarget/$m"));
+        }
+        closedir(DIR);
+    }
 }
 pb_log(1,"INFO: RAW cbp: ".Dumper(%$cbp)."\n");
@@ -415 +426 @@
             if ((defined $force) || (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'})) {
                 if ($debug) {
-                    pb_log(1,"INFO: Executing (on $machine) sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n");
+                    #pb_log(1,"INFO: Executing (on $machine) sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n");
                     #pb_log(1,"INFO: Executing (on $machine) sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $path/$o\n");
                 } else {
                     # TODO: remove hardcoded commands
-                    print $chan "sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n";
+                    #print $chan "sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n";
                     # TODO: get a correct mode before setting it up
                     #print $chan "sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $path/$o\n";

projects/casparbuster/devel/bin/cbusterize

@@ -215 +215 @@
 pb_log(1, "DEBUG: remote account2 = $remote\n");
 
+$ssh2 = cb_ssh_init($remote,$machine,$debug) if (not defined $ssh2);
+
 # Create basedir if it doesn't exist
 if (not -d $basedir) {
@@ -236 +238 @@
     foreach my $p (split(/,/,$plugin)) {    
         pb_log(1,"Getting context for plugin $p\n");
-        $cbp = cb_plugin_get($p,$cbp);
+        $cbp = cb_plugin_get($p,$cbp,$remote,$machine,$debug,$ssh2);
         pb_log(2,"cbp: ".Dumper($cbp)."\n");
         foreach my $k (keys %{$cbp->{$plugin}->{'dirsandfiles'}}) {
@@ -260 +262 @@
 my $realsrc = "";
 my $type = "";
-
-$ssh2 = cb_ssh_init($remote,$machine,$debug) if (not defined $ssh2);
 
 $chan = $ssh2->channel();

projects/casparbuster/devel/etc/cb/plugins/shorewall.conf

@@ -20 +20 @@
 #=cut
 #
-cbpluginfiles shorewall = /etc/shorewall/*|root,root,0600
+#cbpluginfiles shorewall = /etc/shorewall/*|root,root,0600
 #
 #=item B<cbplugindirs>
@@ -30 +30 @@
 #
 #=cut
-cbplugindirs shorewall = /etc/shorewall|root,root,0750
+#cbplugindirs shorewall = /etc/shorewall|root,root,0750
 #
 #=item B<cbplugindirsandfiles>
@@ -40 +40 @@
 #
 #=cut
-cbplugindirsandfiles shorewall =
+#cbplugindirsandfiles shorewall =
 #
-#=item B<cbpluginreload>
+#=item B<cbpluginpkgs>
 #
-# Define the command to launch remotely on the target machine to reload the service. 
+# Define the list of packages to consider remotely on the target machine.
+# Parameters are ',' separated.
 #
 #=cut
-cbpluginreload shorewall = sudo /etc/init.d/shorewall restart
+cbpluginpkgs shorewall = shorewall
+#
+#=item B<cbpkgreload>
+#
+# Define the command to launch remotely on the target machine to reload the service og this package.
+#
+#=cut
+cbpkgreload shorewall = sudo /etc/init.d/shorewall restart

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

@@ -9 +9 @@
 use strict;
 use warnings;
+use Carp;
 use CasparBuster::Env;
 use ProjectBuilder::Base;
@@ -76 +77 @@
 my $plugin = shift;
 my $cbp = shift;
+my $remote = shift;
+my $machine = shift;
+my $debug = shift;
+my $ssh2 = shift;
 
 pb_log(2,"Entering cb_plugin_get for plugin $plugin\n");
-my ($flist,$dlist,$dflist,$slist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbplugindirsandfiles","cbpluginreload");
+my ($flist,$dlist,$dflist,$slist,$plist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbplugindirsandfiles","cbppkgreload","cbpluginpkgs");
 if ((defined $flist) && (defined $flist->{$plugin}) && ($flist->{$plugin} !~ /^\s*$/)) {
     foreach my $block (split(/;/,$flist->{$plugin})) {
@@ -100 +105 @@
     }
 }
-if ((defined $slist) && (defined $slist->{$plugin})) {
-    $cbp->{$plugin}->{'reloadscript'} = $slist->{$plugin};
+if ((defined $plist) && (defined $plist->{$plugin})) {
+    foreach my $name (split(/,/,$plist->{$plugin})) {
+        $cbp->{$plugin}->{'pkgs'}->{$name}->{'name'} = $name;
+        if ((defined $slist) && (defined $slist->{$name})) {
+            $cbp->{$plugin}->{'pkgs'}->{$name}->{'restart'} = $slist->{$name};
+        }
+    }
+} else {
+    $cbp->{$plugin}->{'pkgs'}->{$plugin}->{'name'} = $plugin;
 }
+# Check remotely what conf files are needed for this plugin through its packages
+$ssh2 = cb_ssh_init($remote,$machine,$debug) if (not defined $ssh2);
+
+my $chan = $ssh2->channel();
+pb_log(3,"DEBUG: SSH2 chan called\n");
+confess "Unable to create channel for $remote\@$machine: $!" if (not defined $chan);
+if ($debug) {
+    pb_log(1,"DEBUG: launching a shell via Net:SSH2 ($remote\@$machine)\n");
+}
+confess "Unable to launch remote shell through Net:SSH2 ($remote\@$machine)" if (not $chan->shell());
+pb_log(3,"DEBUG: SSH2 shell called\n");
+
+foreach my $p (keys $cbp->{$plugin}->{'pkgs'}) {
+    # TODO: Do not hardcode rpm
+    my $cmd = "sudo rpm -q -c --dump $p";
+    pb_log(2,"DEBUG: Calling $cmd\n");
+    print $chan "$cmd\n";
+    while (<$chan>) {
+        my ($name,$d1,$d2,$d3,$mode,$uid,$gid,$dummy) = split(/ /,$_);
+        $cbp->{$plugin}->{'files'}->{$name}->{'uid'} = $uid;
+        $cbp->{$plugin}->{'files'}->{$name}->{'gid'} = $gid;
+        $cbp->{$plugin}->{'files'}->{$name}->{'mode'} = substr($mode,4,);
+        pb_log(3,"DEBUG: Found $name");
+    }
+}
+
+$chan->close();
+
 pb_log(2,"cbp: ".Dumper($cbp)."\n");
 return($cbp);