# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001 Craig Barratt
+# Copyright (C) 2001-2003 Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
#========================================================================
#
-# Version __VERSION__, released __RELEASEDATE__.
+# Version 2.0.0_CVS, released 18 Jan 2003.
#
# See http://backuppc.sourceforge.net.
#
last if ( $ConfigPath eq ""
|| ($ConfigPath =~ /^\// && -r $ConfigPath && -w $ConfigPath) );
my $problem = "is not an absolute path";
- $problem = "is no writable" if ( !-w $ConfigPath );
+ $problem = "is not writable" if ( !-w $ConfigPath );
$problem = "is not readable" if ( !-r $ConfigPath );
$problem = "doesn't exist" if ( !-f $ConfigPath );
print("The file '$ConfigPath' $problem.\n");
if ( $ConfigPath ne "" && -r $ConfigPath ) {
(my $topDir = $ConfigPath) =~ s{/[^/]+/[^/]+$}{};
die("BackupPC::Lib->new failed\n")
- if ( !($bpc = BackupPC::Lib->new($topDir)) );
+ if ( !($bpc = BackupPC::Lib->new($topDir, ".")) );
%Conf = $bpc->Conf();
%OrigConf = %Conf;
$Conf{TopDir} = $topDir;
'gtar/tar' => "TarClientPath",
smbclient => "SmbClientPath",
nmblookup => "NmbLookupPath",
+ rsync => "RsyncClientPath",
ping => "PingPath",
df => "DfPath",
- 'ssh2/ssh' => "SshPath",
+ 'ssh/ssh2' => "SshPath",
sendmail => "SendmailPath",
hostname => "HostnamePath",
);
Apache image directory: /usr/local/apache/htdocs/BackupPC
URL for image directory: /BackupPC
+The URL for the image directory should start with a slash.
+
EOF
while ( 1 ) {
$Conf{CgiImageDir} = prompt("--> Apache image directory (full path)",
last if ( $Conf{CgiImageDir} =~ /^\// );
}
while ( 1 ) {
- $Conf{CgiImageDirURL} = prompt("--> URL for image directory (omit http://host)",
+ $Conf{CgiImageDirURL} = prompt("--> URL for image directory (omit http://host; starts with '/')",
$Conf{CgiImageDirURL});
- last if ( $Conf{CgiImageDirURL} ne "" );
+ last if ( $Conf{CgiImageDirURL} =~ /^\// );
}
}
printf("Installing library in $Conf{InstallDir}/lib\n");
foreach my $lib ( qw(BackupPC/Lib.pm BackupPC/FileZIO.pm BackupPC/Attrib.pm
- BackupPC/PoolWrite.pm BackupPC/Xfer/Tar.pm BackupPC/Xfer/Smb.pm
- BackupPC/Zip/FileMember.pm
- BackupPC/Lang/en.pm BackupPC/Lang/fr.pm
+ BackupPC/PoolWrite.pm BackupPC/View.pm BackupPC/Xfer/Tar.pm
+ BackupPC/Xfer/Smb.pm BackupPC/Xfer/Rsync.pm
+ BackupPC/Xfer/RsyncFileIO.pm BackupPC/Zip/FileMember.pm
+ BackupPC/Lang/en.pm BackupPC/Lang/fr.pm
) ) {
InstallFile("lib/$lib", "$Conf{InstallDir}/lib/$lib", 0444);
}
}
printf("Making init.d scripts\n");
-foreach my $init ( qw(linux-backuppc solaris-backuppc) ) {
+foreach my $init ( qw(linux-backuppc solaris-backuppc debian-backuppc) ) {
InstallFile("init.d/src/$init", "init.d/$init", 0444);
}
}
$Conf{EMailFromUserName} ||= $Conf{BackupPCUser};
$Conf{EMailAdminUserName} ||= $Conf{BackupPCUser};
+
+#
+# Update various config parameters
+#
+
+#
+# Guess $Conf{CgiURL}
+#
+if ( !defined($Conf{CgiURL}) ) {
+ if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
+ $Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
+ } else {
+ $Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
+ }
+}
+
+#
+# The smbclient commands have moved from hard-coded to the config file.
+# $Conf{SmbClientArgs} no longer exists, so merge it into the new
+# commands if it still exists.
+#
+if ( defined($Conf{SmbClientArgs}) ) {
+ if ( $Conf{SmbClientArgs} ne "" ) {
+ foreach my $param ( qw(SmbClientRestoreCmd SmbClientFullCmd
+ SmbClientIncrCmd) ) {
+ $newConf->[$newVars->{$param}]{text}
+ =~ s/(-E\s+-N)/$1 $Conf{SmbClientArgs}/;
+ }
+ }
+ delete($Conf{SmbClientArgs});
+}
+
#
# IncrFill should now be off
#
$Conf{IncrFill} = 0;
+
#
# Figure out sensible arguments for the ping command
#
-if ( $^O eq "solaris" || $^O eq "sunos" ) {
- $Conf{PingArgs} ||= '-s $host 56 1';
-} elsif ( $^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd" ) {
- $Conf{PingArgs} ||= '-c 1 -w 3 $host';
-} else {
- $Conf{PingArgs} ||= '-c 1 $host';
+if ( defined($Conf{PingArgs}) ) {
+ $Conf{PingCmd} = '$pingPath ' . $Conf{PingArgs};
+} elsif ( !defined($Conf{PingCmd}) ) {
+ if ( $^O eq "solaris" || $^O eq "sunos" ) {
+ $Conf{PingCmd} = '$pingPath -s $host 56 1';
+ } elsif ( ($^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd")
+ && !system("$Conf{PingClientPath} -c 1 -w 3 localhost") ) {
+ $Conf{PingCmd} = '$pingPath -c 1 -w 3 $host';
+ } else {
+ $Conf{PingCmd} = '$pingPath -c 1 $host';
+ }
+ delete($Conf{PingArgs});
+}
+
+#
+# Figure out sensible arguments for the df command
+#
+if ( !defined($Conf{DfCmd}) ) {
+ if ( $^O eq "solaris" || $^O eq "sunos" ) {
+ $Conf{DfCmd} = '$dfPath -k $topDir';
+ }
+}
+
+#
+# $Conf{SmbClientTimeout} is now $Conf{ClientTimeout}
+#
+if ( defined($Conf{SmbClientTimeout}) ) {
+ $Conf{ClientTimeout} = $Conf{SmbClientTimeout};
+ delete($Conf{SmbClientTimeout});
}
-my $confCopy = "$dest.pre-1.4.0.b1";
+my $confCopy = "$dest.pre-__VERSION__";
if ( -f $dest && !-f $confCopy ) {
#
# Make copy of config file, preserving ownership and modes
print <<EOF;
-Ok, it looks we are finished. There are several more things you
+Ok, it looks like we are finished. There are several more things you
will need to do:
- Browse through the config file, $Conf{TopDir}/conf/config.pl,
my $comment = 1;
my $allVars = {};
while ( <C> ) {
- if ( /^\s*#/ ) {
+ if ( /^#/ ) {
if ( $comment ) {
$out .= $_;
} else {
$allVars->{$var} = @conf if ( defined($var) );
push(@conf, {
text => $out,
- var => $var,
+ var => $var,
});
$out = $_;
} else {