X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=conf%2Fconfig.pl;h=6caece224c1ad9d3407151b8951030a41a4c5592;hp=824ae779bb10cfcf4a98cdf2d86456da42175a91;hb=ee969a9445a5439cf94a516c7d882e12b1bdf945;hpb=617af75f7419e95a9c3ea05b05cf21957acc331c diff --git a/conf/config.pl b/conf/config.pl index 824ae77..6caece2 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: @@ -843,12 +843,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} = ''; # @@ -1161,7 +1181,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 +1225,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 +1262,7 @@ $Conf{RsyncRestoreArgs} = [ '--group', '-D', '--links', + '--hard-links', '--times', '--block-size=2048', '--relative', @@ -1246,9 +1270,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', @@ -1789,7 +1815,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 +1988,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 +2030,7 @@ $Conf{CgiUserConfigEdit} = { ArchiveInfoKeepCnt => 1, BackupFilesOnly => 1, BackupFilesExclude => 1, + BackupsDisable => 1, BlackoutBadPingLimit => 1, BlackoutGoodCnt => 1, BlackoutPeriods => 1,