fix corner case with two instruments on same machine (use conf_name as key, not hostname)

[BackupPC.git] / xls2conf / xls2conf.pl

diff --git a/xls2conf/xls2conf.pl b/xls2conf/xls2conf.pl
index c1b76ca..e5084e3 100755 (executable)
--- a/xls2conf/xls2conf.pl
+++ b/xls2conf/xls2conf.pl
@@ -59,13 +59,13 @@ foreach my $sheet (@{$oBook->{Worksheet}}) {
 
                        print "$ip\tsmb://${share}\n";
 
-                       push @{$smb_share_name{$hostname}}, $share;
+                       push @{$smb_share_name{$conf_name}}, $share;
 
 print O qq`
-# $ip $os
+# $conf_name on $hostname $ip, $os
 \$Conf{XferMethod} = 'smb';
 \$Conf{SmbHostName} = '$hostname';
-\$Conf{SmbShareName} = [ '`,join("','", @{$smb_share_name{$hostname}}),qq`' ];
+\$Conf{SmbShareName} = [ '`,join("','", @{$smb_share_name{$conf_name}}),qq`' ];
 `;
 
                        if ($hosts{$ip}) {
@@ -85,13 +85,13 @@ print O qq`
                        print "$ip\trsync://${share}::${path}\n";
 
                        $path =~ s/([ '])/\\$1/g;
-                       push @{$rsync_share_name{$hostname}}, $path;
+                       push @{$rsync_share_name{$conf_name}}, $path;
 
 print O qq`
-# $ip $os
+# $conf_name on $hostname $ip, $os
 \$Conf{XferMethod} = 'rsyncd';
 \$Conf{RsyncShareName} = [ '$rsync_share' ];
-\$Conf{BackupFilesOnly} = [ '$rsync_share' => '`, join("','$rsync_share' => '", @{$rsync_share_name{$hostname}}), qq`' ];
+\$Conf{BackupFilesOnly} = [ '$rsync_share' => '`, join("','$rsync_share' => '", @{$rsync_share_name{$conf_name}}), qq`' ];
 `;
 
                }