X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=conf%2Fconfig.pl;h=93101579d60f5df9958532f54827ac07c46200be;hp=824ae779bb10cfcf4a98cdf2d86456da42175a91;hb=e4bf7ab080e172b74b3d64c196a72d0ff5d315c5;hpb=617af75f7419e95a9c3ea05b05cf21957acc331c diff --git a/conf/config.pl b/conf/config.pl index 824ae77..9310157 100644 --- a/conf/config.pl +++ b/conf/config.pl @@ -98,7 +98,7 @@ $Conf{UmaskMode} = 027; # you might have only one or two wakeups each night. This will keep # the backup activity after hours. On the other hand, if you are backing # up laptops that are only intermittently connected to the network you -# will want to have frequent wakeups (eg: hourly) to maximized the chance +# will want to have frequent wakeups (eg: hourly) to maximize the chance # that each laptop is backed up. # # Examples: @@ -201,7 +201,7 @@ $Conf{MaxOldLogFiles} = 14; # Full path to the df command. Security caution: normal users # should not allowed to write to this file or directory. # -$Conf{DfPath} = '/bin/df'; +$Conf{DfPath} = ''; # # Command to run df. The following variables are substituted at run-time: @@ -214,12 +214,11 @@ $Conf{DfCmd} = '$dfPath $topDir'; # # Full path to various commands for archiving # - -$Conf{SplitPath} = '/usr/bin/split'; -$Conf{ParPath} = '/usr/bin/par2'; -$Conf{CatPath} = '/bin/cat'; -$Conf{GzipPath} = '/bin/gzip'; -$Conf{Bzip2Path} = '/usr/bin/bzip2'; +$Conf{SplitPath} = ''; +$Conf{ParPath} = ''; +$Conf{CatPath} = ''; +$Conf{GzipPath} = ''; +$Conf{Bzip2Path} = ''; # # Maximum threshold for disk utilization on the __TOPDIR__ filesystem. @@ -648,7 +647,7 @@ $Conf{ArchiveInfoKeepCnt} = 10; # the setting is assumed to apply all shares. # # If a hash is used, a special key "*" means it applies to all -# shares. +# shares that don't have a specific entry. # # Examples: # $Conf{BackupFilesOnly} = '/myFiles'; @@ -698,7 +697,7 @@ $Conf{BackupFilesOnly} = undef; # followed by "/*", eg: "/proc/*", instead of just "/proc". # # If a hash is used, a special key "*" means it applies to all -# shares. +# shares that don't have a specific entry. # # Examples: # $Conf{BackupFilesExclude} = '/temp'; @@ -843,12 +842,32 @@ $Conf{XferLogLevel} = 1; # # Filename charset encoding on the client. BackupPC uses utf8 # on the server for filename encoding. If this is empty, then -# utf8 is assumed and client filenames will not be modified. If set -# to a different encoding then filenames will be re-encoded in utf8. -# A typical WinXX encoding for latin1/western europe is 'cp1252'. +# utf8 is assumed and client filenames will not be modified. +# If set to a different encoding then filenames will converted +# to/from utf8 automatically during backup and restore. +# +# If the file names displayed in the browser (eg: accents or special +# characters) don't look right then it is likely you haven't set +# $Conf{ClientCharset} correctly. +# +# If you are using smbclient on a WinXX machine, smbclient will convert +# to the "unix charset" setting in smb.conf. The default is utf8, +# in which case leave $Conf{ClientCharset} empty since smbclient does +# the right conversion. +# +# If you are using rsync on a WinXX machine then it does no conversion. +# A typical WinXX encoding for latin1/western europe is 'cp1252', +# so in this case set $Conf{ClientCharset} to 'cp1252'. +# +# On a linux or unix client, run "locale charmap" to see the client's +# charset. Set $Conf{ClientCharset} to this value. A typical value +# for english/US is 'ISO-8859-1'. +# # Do "perldoc Encode::Supported" to see the list of possible charset -# values, and also see http://czyborra.com/charsets/iso8859.html. -# +# values. The FAQ at http://www.cl.cam.ac.uk/~mgk25/unicode.html +# is excellent, and http://czyborra.com/charsets/iso8859.html +# provides more information on the iso-8859 charsets. +# $Conf{ClientCharset} = ''; # @@ -892,7 +911,7 @@ $Conf{SmbSharePasswd} = ''; # # This setting only matters if $Conf{XferMethod} = 'smb'. # -$Conf{SmbClientPath} = '/usr/bin/smbclient'; +$Conf{SmbClientPath} = ''; # # Command to run smbclient for a full dump. @@ -1071,12 +1090,12 @@ $Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host' # # This setting only matters if $Conf{XferMethod} = 'tar'. # -$Conf{TarClientPath} = '/bin/tar'; +$Conf{TarClientPath} = ''; # # Path to rsync executable on the client # -$Conf{RsyncClientPath} = '/bin/rsync'; +$Conf{RsyncClientPath} = ''; # # Full command to run rsync on the client machine. The following variables @@ -1161,7 +1180,7 @@ $Conf{RsyncdAuthRequired} = 1; # # When rsync checksum caching is enabled (by adding the # --checksum-seed=32761 option to $Conf{RsyncArgs}), the cached -# checksums can be occaisonally verified to make sure the file +# checksums can be occasionally verified to make sure the file # contents matches the cached checksums. This is to avoid the # risk that disk problems might cause the pool file contents to # get corrupted, but the cached checksums would make BackupPC @@ -1205,14 +1224,17 @@ $Conf{RsyncArgs} = [ '--group', '-D', '--links', + '--hard-links', '--times', '--block-size=2048', '--recursive', # - # If you are using a patched client rsync that supports the - # --checksum-seed option (see http://backuppc.sourceforge.net), - # then uncomment this to enabled rsync checksum cachcing + # Rsync >= 2.6.3 supports the --checksum-seed option + # which allows rsync checksum caching on the server. + # Uncomment this to enable rsync checksum caching if + # you have a recent client rsync version and you want + # to enable checksum caching. # #'--checksum-seed=32761', @@ -1239,6 +1261,7 @@ $Conf{RsyncRestoreArgs} = [ '--group', '-D', '--links', + '--hard-links', '--times', '--block-size=2048', '--relative', @@ -1246,9 +1269,11 @@ $Conf{RsyncRestoreArgs} = [ '--recursive', # - # If you are using a patched client rsync that supports the - # --checksum-seed option (see http://backuppc.sourceforge.net), - # then uncomment this to enabled rsync checksum cachcing + # Rsync >= 2.6.3 supports the --checksum-seed option + # which allows rsync checksum caching on the server. + # Uncomment this to enable rsync checksum caching if + # you have a recent client rsync version and you want + # to enable checksum caching. # #'--checksum-seed=32761', @@ -1271,7 +1296,7 @@ $Conf{BackupPCdShareName} = '/'; # # Path to backuppcd executable on the server # -$Conf{BackupPCdPath} = '/usr/bin/backuppcd'; +$Conf{BackupPCdPath} = ''; # # Full command to run backuppcd on the server to backup a given @@ -1387,7 +1412,7 @@ $Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost' # Full path for ssh. Security caution: normal users should not # allowed to write to this file or directory. # -$Conf{SshPath} = '/usr/bin/ssh'; +$Conf{SshPath} = ''; # # Full path for nmblookup. Security caution: normal users should not @@ -1396,7 +1421,7 @@ $Conf{SshPath} = '/usr/bin/ssh'; # nmblookup is from the Samba distribution. nmblookup is used to get the # netbios name, necessary for DHCP hosts. # -$Conf{NmbLookupPath} = '/usr/bin/nmblookup'; +$Conf{NmbLookupPath} = ''; # # NmbLookup command. Given an IP address, does an nmblookup on that @@ -1456,7 +1481,7 @@ $Conf{FixedIPNetBiosNameCheck} = 0; # # $Conf{PingPath} = '/bin/echo'; # -$Conf{PingPath} = '/bin/ping'; +$Conf{PingPath} = ''; # # Ping command. The following variables are substituted at run-time: @@ -1673,7 +1698,7 @@ $Conf{ClientNameAlias} = undef; # Full path to the sendmail command. Security caution: normal users # should not allowed to write to this file or directory. # -$Conf{SendmailPath} = '/usr/sbin/sendmail'; +$Conf{SendmailPath} = ''; # # Minimum period between consecutive emails to a single user. @@ -1789,7 +1814,9 @@ $Conf{EMailOutlookBackupSubj} = undef; $Conf{EMailOutlookBackupMesg} = undef; # -# Additional email headers +# Additional email headers. If you change the charset +# to utf8 then BackupPC_sendEmail will use utf8 for +# the email body. # $Conf{EMailHeaders} = < '#ffff99', Reason_backup_canceled_by_user => '#ff9900', Status_backup_in_progress => '#66cc99', + Disabled_OnlyManualBackups => '#d1d1d1', + Disabled_AllBackupsDisabled => '#d1d1d1', }; # @@ -1958,10 +1987,14 @@ $Conf{CgiExt2ContentType} = { }; $Conf{CgiImageDirURL} = ''; # -# CSS stylesheet for the CGI interface. It is stored in the -# $Conf{CgiImageDir} directory and accessed via the +# CSS stylesheet "skin" for the CGI interface. It is stored +# in the $Conf{CgiImageDir} directory and accessed via the # $Conf{CgiImageDirURL} URL. # +# For BackupPC v3.x several color, layout and font changes were made. +# The previous v2.x version is available as BackupPC_stnd_orig.css, so +# if you prefer the old skin, change this to BackupPC_stnd_orig.css. +# $Conf{CgiCSSFile} = 'BackupPC_stnd.css'; # @@ -1996,6 +2029,7 @@ $Conf{CgiUserConfigEdit} = { ArchiveInfoKeepCnt => 1, BackupFilesOnly => 1, BackupFilesExclude => 1, + BackupsDisable => 1, BlackoutBadPingLimit => 1, BlackoutGoodCnt => 1, BlackoutPeriods => 1, @@ -2014,6 +2048,7 @@ $Conf{CgiUserConfigEdit} = { TarIncrArgs => 1, TarClientCmd => 0, TarClientRestoreCmd => 0, + TarClientPath => 0, RsyncShareName => 1, RsyncdClientPort => 1, RsyncdPasswd => 1, @@ -2023,6 +2058,7 @@ $Conf{CgiUserConfigEdit} = { RsyncRestoreArgs => 1, RsyncClientCmd => 0, RsyncClientRestoreCmd => 0, + RsyncClientPath => 0, ArchiveDest => 1, ArchiveComp => 1, ArchivePar => 1,