projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* When there is an existing partial, a new partials is only saved
[BackupPC.git]
/
conf
/
config.pl
diff --git
a/conf/config.pl
b/conf/config.pl
index
9d0c276
..
461e3f8
100644
(file)
--- a/
conf/config.pl
+++ b/
conf/config.pl
@@
-29,7
+29,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001-200
3
Craig Barratt
+# Copyright (C) 2001-200
7
Craig Barratt
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-103,19
+103,17
@@
$Conf{UmaskMode} = 027;
#
# Examples:
# $Conf{WakeupSchedule} = [22.5]; # once per day at 10:30 pm.
#
# Examples:
# $Conf{WakeupSchedule} = [22.5]; # once per day at 10:30 pm.
-# $Conf{WakeupSchedule} = [1..23]; # every hour except midnight
# $Conf{WakeupSchedule} = [2,4,6,8,10,12,14,16,18,20,22]; # every 2 hours
#
# The default value is every hour except midnight.
#
# $Conf{WakeupSchedule} = [2,4,6,8,10,12,14,16,18,20,22]; # every 2 hours
#
# The default value is every hour except midnight.
#
-# The first entry of $Conf{WakeupSchedule} is when BackupPC_nightly
-# is run. No other backups can run while BackupPC_nightly is
-# running. You might want to re-arrange the entries in
-# $Conf{WakeupSchedule} (they don't have to be ascending) so that
-# the first entry is when you want BackupPC_nightly to run
-# (eg: when you don't expect a lot of regular backups to run).
+# The first entry of $Conf{WakeupSchedule} is when BackupPC_nightly is run.
+# You might want to re-arrange the entries in $Conf{WakeupSchedule}
+# (they don't have to be ascending) so that the first entry is when
+# you want BackupPC_nightly to run (eg: when you don't expect a lot
+# of regular backups to run).
#
#
-$Conf{WakeupSchedule} = [1
..
23];
+$Conf{WakeupSchedule} = [1
, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23];
#
# Maximum number of simultaneous backups to run. If there
#
# Maximum number of simultaneous backups to run. If there
@@
-647,7
+645,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
# 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';
#
# Examples:
# $Conf{BackupFilesOnly} = '/myFiles';
@@
-697,7
+695,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
# 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';
#
# Examples:
# $Conf{BackupFilesExclude} = '/temp';
@@
-870,6
+868,17
@@
$Conf{XferLogLevel} = 1;
#
$Conf{ClientCharset} = '';
#
$Conf{ClientCharset} = '';
+#
+# Prior to 3.x no charset conversion was done by BackupPC. Backups were
+# stored in what ever charset the XferMethod provided - typically utf8
+# for smbclient and the client's locale settings for rsync and tar (eg:
+# cp1252 for rsync on WinXX and perhaps iso-8859-1 with rsync on linux).
+# This setting tells BackupPC the charset that was used to store file
+# names in old backups taken with BackupPC 2.x, so that non-ascii file
+# names in old backups can be viewed and restored.
+#
+$Conf{ClientCharsetLegacy} = 'iso-8859-1';
+
#
# Name of the host share that is backed up when using SMB. This can be a
# string or an array of strings if there are multiple shares per host.
#
# Name of the host share that is backed up when using SMB. This can be a
# string or an array of strings if there are multiple shares per host.
@@
-1864,8
+1873,8
@@
$Conf{CgiURL} = undef;
#
# Language to use. See lib/BackupPC/Lang for the list of supported
# languages, which include English (en), French (fr), Spanish (es),
#
# Language to use. See lib/BackupPC/Lang for the list of supported
# languages, which include English (en), French (fr), Spanish (es),
-# German (de), Italian (it), Dutch (nl)
and
Portuguese Brazillian
-# (pt_br).
+# German (de), Italian (it), Dutch (nl)
,
Portuguese Brazillian
+# (pt_br)
and Chinese (zh_CH)
.
#
# Currently the Language setting applies to the CGI interface and email
# messages sent to users. Log files and other text are still in English.
#
# Currently the Language setting applies to the CGI interface and email
# messages sent to users. Log files and other text are still in English.
@@
-1897,8
+1906,9
@@
$Conf{CgiUserHomePageCheck} = '';
$Conf{CgiUserUrlCreate} = 'mailto:%s';
#
$Conf{CgiUserUrlCreate} = 'mailto:%s';
#
-# Date display format for CGI interface. True for US-style dates (MM/DD)
-# and zero for international dates (DD/MM).
+# Date display format for CGI interface. A value of 1 uses US-style
+# dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero
+# for international dates (DD/MM).
#
$Conf{CgiDateFormatMMDD} = 1;
#
$Conf{CgiDateFormatMMDD} = 1;
@@
-2035,6
+2045,7
@@
$Conf{CgiUserConfigEdit} = {
BlackoutPeriods => 1,
BackupZeroFilesIsFatal => 1,
ClientCharset => 1,
BlackoutPeriods => 1,
BackupZeroFilesIsFatal => 1,
ClientCharset => 1,
+ ClientCharsetLegacy => 1,
XferMethod => 1,
XferLogLevel => 1,
SmbShareName => 1,
XferMethod => 1,
XferLogLevel => 1,
SmbShareName => 1,
@@
-2048,15
+2059,18
@@
$Conf{CgiUserConfigEdit} = {
TarIncrArgs => 1,
TarClientCmd => 0,
TarClientRestoreCmd => 0,
TarIncrArgs => 1,
TarClientCmd => 0,
TarClientRestoreCmd => 0,
+ TarClientPath => 0,
RsyncShareName => 1,
RsyncdClientPort => 1,
RsyncdPasswd => 1,
RsyncShareName => 1,
RsyncdClientPort => 1,
RsyncdPasswd => 1,
+ RsyncdUserName => 1,
RsyncdAuthRequired => 1,
RsyncCsumCacheVerifyProb => 1,
RsyncArgs => 1,
RsyncRestoreArgs => 1,
RsyncClientCmd => 0,
RsyncClientRestoreCmd => 0,
RsyncdAuthRequired => 1,
RsyncCsumCacheVerifyProb => 1,
RsyncArgs => 1,
RsyncRestoreArgs => 1,
RsyncClientCmd => 0,
RsyncClientRestoreCmd => 0,
+ RsyncClientPath => 0,
ArchiveDest => 1,
ArchiveComp => 1,
ArchivePar => 1,
ArchiveDest => 1,
ArchiveComp => 1,
ArchivePar => 1,