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

 our $VERSION = '0.1';
 use FindBin;
 use lib "$FindBin::Bin/..";
 use Data::Dumper;
-use ZFS_Utils qw(loadConfig shredFile logMsg makeReplicateCommands mountDriveByLabel mountGeli runCmd $logFileName $displayLogsOnConsole);
+use ZFS_Utils qw(loadConfig shredFile logMsg makeReplicateCommands mountDriveByLabel mountGeli runCmd sendReport $logFileName $displayLogsOnConsole);
+my $scriptDirectory = $FindBin::RealBin;
+my $scriptFullPath = "$scriptDirectory/" . $FindBin::Script;
 # if set, will not actually write files to disk
 my $DEBUG = 0;
-# set the log file to be next to this script
-$logFileName = "$FindBin::Bin/sneakernet.log";
-# log only for one run
-unlink ( $logFileName ) if -f $logFileName;
 # display all log messages on console in addition to the log file
 $displayLogsOnConsole = 1;
-my $configFileName = "$0.conf.yaml";
+my $configFileName = "$scriptFullPath.conf.yaml";
 my $config = {
    # file created on source server to track last copyed dataset
-   'status_file' => "$0.status",
+   'status_file' => "$scriptFullPath.status",
+   'log_file' => "$scriptFullPath.log",
    #information about source server
    'source_server' => {
       'hostname' => '', # used to see if we are on source
       'poolname' => 'pool', # name of the ZFS pool to export
       # if set, will generate a report via email or by storing on a drive
       'report' => {
          'email' => 'tech@example.org',
          'subject' => 'AG Transport Report',
          'targetDrive' => {
+            'fstype' => '', # filesystem type of the report drive
+            # How often to check for the disk (seconds), message displayed every interval
+            'check_interval' => 15,
             'label' => '',
             'mount_point' => '',
+         }
+      }
    },
       'hostname' => '', # used to see if we are on target
       'poolname' => 'backup', # name of the ZFS pool to import
       # if this is set, the dataset uses GELI, so we must decrypt and
       # mount it first
       'geli' => {
+         'secureKey ' => {
-         'keydiskname' => 'replica', # the GPT label of the key disk
+            'label' => 'replica', # the GPT label of the key disk
+            'fstype' => 'ufs', # filesystem type of the key disk
+            'check_interval' => 15,
+            'wait_timeout' => 300,
-         'keyfile' => 'geli.key', # the name of the key file on keydiskname
+            'keyfile' => 'geli.key', # the name of the key file on the secureKey disk
+         },
          'localKey' => 'e98c660cccdae1226550484d62caa2b72f60632ae0c607528aba1ac9e7bfbc9c', # hex representation of the local key part
          'target' => '/media/geli.key', # location to create the combined keyfile
          'poolname' => 'backup', # name of the ZFS pool to import
          'diskList' => [
             'da0',
       },
       'report' => {
          'email' => '',
          'subject' => '',
          'targetDrive' => {
+            'fstype' => 'msdos', # filesystem type of the report drive
-            'label' => 'sneakernet_report',
+            'label' => 'sneakernet',
-            'mount_point' => '/mnt/sneakernet_report',
+            'mount_point' => '',
+         }
+      }
    },
    'transport' => {
       # this is the GPT label of the sneakernet disk
       'disk_label' => 'sneakernet',
+      # this is the file system type. Not needed if ufs
+      'fstype' => 'ufs',
       # where we want to mount it
       'mount_point' => '/mnt/sneakernet',
       # amount of time to wait for the disk to appear
       'timeout' => 600,
+      # How often to check for the disk (seconds), message displayed every interval
+      'check_interval' => 15,
       # if set, all files will be encrypted with this key/IV during transport
       'encryption' => {
          'key'    => '', # openssl rand 32 | xxd -p | tr -d '\n' > test.key
          'IV'     => '00000000000000000000000000000000',
       },
          'filename' => 'files_share'
       },
+   }
 };
-# read the status file and return as list
+# read the status file and return as list. If the file doesn't exits, returns an empty list
 sub getStatusFile {
    my $filename = shift;
    # read in history/status file
    my @lines = ();
    if ( -e $filename && open my $fh, '<', $filename ) {
 # If a YAML config file exists next to the script, load and merge it
 $config = loadConfig($configFileName, $config );
 # set some defaults
-$config->{'status_file'} //= "$0.status";
+$config->{'status_file'} //= "$scriptFullPath.status";
+# set log file name for sub logMsg in ZFS_Utils, and remove the old log if it exists
+# Log file is only valid for one run
+$logFileName = $config->{'log_file'} //= "$scriptFullPath.log";
+# log only for one run
+unlink ( $logFileName ) if -f $logFileName;
 fatalError( "Invalid config file: missing source and/or target server" )
     unless (defined $config->{source_server} && defined $config->{target_server});
 # mount the transport drive, fatal error if we can not find it
 fatalError( "Unable to mount tranport drive with label $config->{transport}->{disk_label}" )
-   unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport}->{disk_label}, $config->{transport}->{mount_point}, $config->{transport}->{timeout} );
+   unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
 my $servername = `hostname -s`;
 chomp $servername;
-if ( $servername eq $config->{source_server}->{hostname} ) {
+my $runningAs = $servername eq $config->{source_server}->{hostname} ? 'source' :
+                $servername eq $config->{target_server}->{hostname} ? 'target' : 'unknown';
+if ( $runningAs eq 'source' ) {
     logMsg "Running as source server";
     # remove all files from transport disk, but leave all subdirectories alone
     cleanDirectory( $config->{transport}->{mount_point} );
     my $statusList = getStatusFile($config->{status_file});
     $statusList = doSourceReplication($config, $statusList);
     writeStatusFile($config->{status_file}, $statusList);
-    # source server logic here
-} elsif ( $servername eq $config->{target_server}->{hostname} ) {
+} elsif ( $runningAs eq 'target' ) {
     logMsg "Running as target server";
     die "Target Server code not complete\n";
     die "GELI target server logic not yet implemented\n" if ( defined $config->{target_server}->{geli} );
     mountGeli( $config->{target_server}->{geli} ) if ( defined $config->{target_server}->{geli} );
 } else {
     logMsg "This server ($servername) is neither source nor target server as per config\n";
     die;
+}
+# add disk space utilization information on transport to the log
+logMsg( "Disk space utilization on transport disk:\n" . runCmd( "df -h $config->{transport}->{mount_point}" ) . "\n" );
+# add information about the server (zpools) to the log
+logMsg( "Zpools on server $servername:\n" . join( "\n", runCmd( "zpool list" ) ) . "\n" );
 # unmount the sneakernet drive
 `umount $config->{transport}->{mount_point}`;
 # and remove the directory
 rmdir $config->{transport}->{mount_point};
+sendReport( $config->{$runningAs}->{report}, "sneakernet replication completed on server $servername", $config->{log_file} );
 ;
 #`cat $config->{input} | openssl enc -aes-256-cbc -K $config->{key} -iv $config->{IV} > $config->{output}`;

Subversion Repositories zfs_utils

(root)/trunk/sneakernet/sneakernet – Rev 34 → 35