From: cbarratt Date: Sun, 21 Mar 2004 01:46:45 +0000 (+0000) Subject: - minor lang file cleanup - commented unimplemented share names link X-Git-Tag: v2_1_0beta0~2 X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=3ae3b7557db4829ebfc6f580ceac30376717db6a - minor lang file cleanup - commented unimplemented share names link from restore and admin options - fixed lib/BackupPC/CGI/View.pm to use functions to return log file data for display - updated makeDist to produce better looking BackupPC.html docs with perl 5.8.x. --- diff --git a/ChangeLog b/ChangeLog index 0120564..2499045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,20 +27,16 @@ dumps. Only one partial is kept, and it is removed as soon as a successful full (or a new partial) is done. - (Note: still needs some work to cleanup any partial files when the - dump is interrupted or fails). - * Added support for resuming a full dump for rsync. The partial full is kept, and to resume an incremental is done against the partial, and a full is done for the rest. - (Note: not tested! Also needs a new File::RsyncP that I haven't - yet released.) - * Added support for Rsync checksum caching. Rsync checksum are appended to the compressed pool files. This means that block and file checksums do not need to be recomputed on the server - when using rsync. + when using rsync. Requires a patch to rsync to support fixed + checksum seeds. This patch is included in the cygwin-rsyncd + release on http://backuppc.sourceforge.net. * Major addition of Archive feature from Josh Marshall. Special clients can be configured to be archive targets (eg: tape drives, @@ -78,7 +74,9 @@ files. * Addition of administration options from Paul Lukins. Initial - page allows server to be started/stopped/reloaded. + page allows server to be started/stopped/reloaded. This still + needs some i18n work. Currently the server start/stop is + commented out. * Split BackupPC_Admin into a set of modules, one for each major action. Each action is now a seperate module in lib/BackupPC/CGI. diff --git a/conf/config.pl b/conf/config.pl index ff5090e..1b8054c 100644 --- a/conf/config.pl +++ b/conf/config.pl @@ -673,19 +673,24 @@ $Conf{BackupZeroFilesIsFatal} = 1; # # The valid values are: # -# - 'smb': backup and restore via smbclient and the SMB protocol. -# Best choice for WinXX. +# - 'smb': backup and restore via smbclient and the SMB protocol. +# Easiest choice for WinXX. # -# - 'rsync': backup and restore via rsync (via rsh or ssh). -# Best choice for linux/unix. Can also work on WinXX. +# - 'rsync': backup and restore via rsync (via rsh or ssh). +# Best choice for linux/unix. Good choice also for WinXX. # -# - 'rsyncd': backup and restre via rsync daemon on the client. -# Best choice for linux/unix if you have rsyncd running on -# the client. Can also work on WinXX. +# - 'rsyncd': backup and restre via rsync daemon on the client. +# Best choice for linux/unix if you have rsyncd running on +# the client. Good choice also for WinXX. # # - 'tar': backup and restore via tar, tar over ssh, rsh or nfs. # Good choice for linux/unix. # +# - 'archive': host is a special archive host. Backups are not done. +# An archive host is used to archive other host's backups +# to permanent media, such as tape, CDR or DVD. +# +# $Conf{XferMethod} = 'smb'; # diff --git a/doc-src/BackupPC.pod b/doc-src/BackupPC.pod index e121b15..a8ddc27 100644 --- a/doc-src/BackupPC.pod +++ b/doc-src/BackupPC.pod @@ -697,7 +697,7 @@ DHCP addresses to search is specified in $Conf{DHCPAddressRanges}. Note also that the $Conf{ClientNameAlias} feature does not work for clients with DHCP set to 1. - + =item User name This should be the unix login/email name of the user who "owns" or uses @@ -834,7 +834,7 @@ is recommended. Rsync is run on the remote client via rsh or ssh. The relevant configuration settings are $Conf{RsyncClientPath}, $Conf{RsyncClientCmd}, $Conf{RsyncClientRestoreCmd}, $Conf{RsyncShareName}, -$Conf{RsyncArgs}, $Conf{RsyncRestoreArgs} and $Conf{RsyncLogLevel}. +$Conf{RsyncArgs}, and $Conf{RsyncRestoreArgs}. =item rsyncd @@ -844,10 +844,10 @@ the client machine and BackupPC connects directly to it. The relevant configuration settings are $Conf{RsyncdClientPort}, $Conf{RsyncdUserName}, $Conf{RsyncdPasswd}, $Conf{RsyncdAuthRequired}, -$Conf{RsyncShareName}, $Conf{RsyncArgs}, $Conf{RsyncRestoreArgs} -and $Conf{RsyncLogLevel}. In the case of rsyncd, $Conf{RsyncShareName} -is the name of an rsync module (ie: the thing in square brackets in -rsyncd's conf file -- see rsyncd.conf), not a file system path. +$Conf{RsyncShareName}, $Conf{RsyncArgs}, and $Conf{RsyncRestoreArgs}. +$Conf{RsyncShareName} is the name of an rsync module (ie: the thing +in square brackets in rsyncd's conf file -- see rsyncd.conf), not a +file system path. Be aware that rsyncd will remove the leading '/' from path names in symbolic links if you specify "use chroot = no" in the rsynd.conf file. @@ -2028,6 +2028,15 @@ Each archive type is specified by a BackupPC host with its XferMethod set to 'archive'. This allows for multiple configurations at sites where there might be a combination of tape and cd/dvd backups being made. +BackupPC provides a menu that allows one or more hosts to be archived. +The most recent backup of each host is archived using BackupPC_tarCreate, +and the output is optionally compressed and split into fixed-sized +files (eg: 650MB). + +The archive for each host is done by default using +__INSTALLDIR__/BackupPC_archiveHost. This script can be copied +and customized as needed. + =head2 Configuring an Archive Host To create an Archive Host, add it to the hosts file just as any other host @@ -2039,13 +2048,13 @@ the Archive Hosts's pc directory, adding the following line: $Conf{XferMethod} = 'archive'; To further customise the archive's parameters you can adding the changed -parameters in the host's config.pl file. The parameters are explained in the config.pl -file. +parameters in the host's config.pl file. The parameters are explained in +the config.pl file. Parameters may be fixed or the user can be allowed +to change them (eg: output device). -The example archive programs included with BackupPC are for a CD and -Tape archive. The programs are called BackupPC_archivecd and -BackupPC_archivetape. These are specified by the ArchiveClientCmd configuration -parameter. +The per-host archive command is $Conf{ArchiveClientCmd}. By default +this invokes __INSTALLDIR__/BackupPC_archiveHost, which you can +copy and customize as necessary. =head2 Starting an Archive @@ -3144,7 +3153,7 @@ See L. =head1 Copyright -Copyright (C) 2001-2003 Craig Barratt +Copyright (C) 2001-2004 Craig Barratt =head1 Credits diff --git a/lib/BackupPC/CGI/Lib.pm b/lib/BackupPC/CGI/Lib.pm index f689700..683dd58 100644 --- a/lib/BackupPC/CGI/Lib.pm +++ b/lib/BackupPC/CGI/Lib.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.1.0_CVS, released 8 Feb 2004. +# Version 2.1.0_CVS, released 13 Mar 2004. # # See http://backuppc.sourceforge.net. # @@ -387,7 +387,7 @@ sub ConfirmIPAddress sub Header { - my($title, $content, $noBrowse) = @_; + my($title, $content, $noBrowse, $contentSub, $contentPost) = @_; my @adminLinks = ( { link => "", name => $Lang->{Status}, priv => 1}, @@ -449,23 +449,20 @@ EOF NavLink("?action=view&type=config&host=${EscURI($host)}", $Lang->{Config_file}, " class=\"navbar\""); } - print < -
-$content -


-
-\n"; + } + print("
\n$content\n"); + if ( defined($contentSub) && ref($contentSub) eq "CODE" ) { + while ( (my $s = &$contentSub()) ne "" ) { + print($s); + } + } + print($contentPost) if ( defined($contentPost) ); + print <