WebSVN – zfs_utils – Diff – /trunk/sneakernet/sneakernet

 use strict;
 use warnings;
 our $VERSION = '0.1';
+use File::Basename;
 use FindBin;
 use lib "$FindBin::Bin/..";
 use Data::Dumper;
-use ZFS_Utils qw(loadConfig shredFile logMsg makeReplicateCommands mountDriveByLabel unmountDriveByLabel mountGeli runCmd sendReport fatalError cleanDirectory $logFileName $displayLogsOnConsole);
+use ZFS_Utils qw(loadConfig shredFile logMsg makeReplicateCommands mountDriveByLabel unmountDriveByLabel mountGeli runCmd sendReport fatalError getDirectoryList cleanDirectory $logFileName $displayLogsOnConsole);
 use Getopt::Long qw(GetOptions);
 Getopt::Long::Configure ("bundling");
 my $scriptDirectory = $FindBin::RealBin;
 my $scriptFullPath = "$scriptDirectory/" . $FindBin::Script;
+   }
+}
 # simple sub to take root/dataset/datset/dataset and turn it into
 # dataset.dataset.dataset
-sub replaceSlashWithDot {
+sub dirnameToFileName {
-   my $string = shift;
+   my ( $string, $delimiter, $substitution ) = @_;
-   my @parts = split( "/", $string );
+   $delimiter //= '/';
-   shift @parts;
+   $substitution //= '.';
+   my @parts = split( /\Q$delimiter\E/, $string );
-   return join( '.', @parts );
+   return join( $substitution, @parts );
+}
 # perform replication on source server
 # $config - configuration hashref
 # $statusList - list of last snapshots replicated for each dataset in previous replications
    my $newStatus = [];
    foreach my $dataset ( sort keys %{$config->{datasets}} ) {
       logMsg("Processing dataset '$dataset'");
       # get list of all snapshots on dataset
       my $sourceList;
+#      print Dumper( $config ) . "\n";
+#      print "$dataset\n";
+#      print Dumper( $config->{datasets}->{$dataset} ) . "\n";
+#      die;
       if ( -e "$scriptDirectory/test.status") {
          $sourceList = getStatusFile( "$scriptDirectory/test.status" );
       } else {
-         $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}-{$dataset}->{source}" ) ];
+         $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}->{$dataset}->{source}" ) ];
+      }
-      # remove the parent part, leave the dataset itself
-      $sourceList =~ s|/||;
       # process dataset here
       my $commands = makeReplicateCommands(
                         $sourceList,
                         $statusList,
                         $dataset,
          foreach my $cmd ( keys %$commands ) {
             my $command = $commands->{$cmd};
             my $outputFile = $cmd;
             $outputFile = replaceSlashWithDot($outputFile);
             $command .= " | openssl enc -aes-256-cbc -K $config->{transport}->{encryption}->{key} -iv $config->{transport}->{encryption}->{IV} " if $config->{transport}->{encryption}->{key};
-            $command .= " > $config->{transport}->{mount_point}/" . $cmd;
+            $command .= " > $config->{transport}->{mount_point}/" . dirnameToFileName( $cmd );
             logMsg("Running command: $command");
             runCmd(  $command  ) unless $config->{dryrun};
+         }
       } else {
          logMsg( "Nothing to do for $dataset" );
 # update the target datasets from the files on the transport drive
 sub updateTarget {
    my $config = shift;
    my $files = getDirectoryList( $config->{transport}->{mount_point});
    foreach my $filename ( @$files ) {
+      my $targetDataset = basename( $filename );
+      my ($dataset) = split( /\Q\.\E/, $targetDataset ); # grab only the first element of a string which has internal delimiters
-     my $command = "cat $config->{output} | openssl enc -aes-256-cbc -d -K $config->{key} -iv $config->{IV}";
+      $targetDataset = $config->{datasets}->{$dataset}->{target} . '/' . dirnameToFileName( $targetDataset, '.', '/' );
+      my $command = "cat $filename";
+      $command .= " | openssl enc -aes-256-cbc -d -K $config->{transport}->{encryption}->{key} -iv $config->{transport}->{encryption}->{IV} " if $config->{transport}->{encryption}->{key};
+      $command .= " | zfs receive -F $targetDataset";
+      logMsg( $command );
+      runCmd( $command );
+   }
+}
 ##################### main program starts here #####################
 # Example to create a random key for encryption/decryption:
                 $servername eq $config->{target}->{hostname} ? 'target' : 'unknown';
 #cleanup( $config, "Testing" );
 # mount the transport drive, fatal error if we can not find it
-fatalError( "Unable to mount tranport drive with label $config->{transport}->{disk_label}", $config, \&cleanup )
+fatalError( "Unable to mount tranport drive with label $config->{transport}->{label}", $config, \&cleanup )
-   unless $config->{dryrun} or $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
+   unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
 # main program logic
 if ( $config->{runningAs} eq 'source' ) {
     logMsg "Running as source server";
     # remove all files from transport disk, but leave all subdirectories alone
     $statusList = doSourceReplication($config, $statusList);
     writeStatusFile($config->{status_file}, $statusList) unless $config->{dryrun};
 } elsif ( $config->{runningAs} eq 'target' ) {
     logMsg "Running as target server";
     mountGeli( $config->{target}->{geli} ) if ( defined $config->{target}->{geli} );
+    umountDiskByLabel( $config->{target}->{geli}->{secureKey} )
+       unless $config->{target}->{geli}->{secureKey}->{label} eq $config->{transport}->{label};
+    print "Please insert device labeled REPORT\n" if $config->{target}->{report}->{targetDrive}->{label};
     updateTarget( $config );
 } else {
     fatalError( "This server ($servername) is neither source nor target server as per config\n" );
+}

Subversion Repositories zfs_utils

(root)/trunk/sneakernet/sneakernet – Rev 45 → 46