projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Added some performance improvements to BackupPC::Xfer::RsyncFileIO
[BackupPC.git]
/
conf
/
config.pl
diff --git
a/conf/config.pl
b/conf/config.pl
index
069dd66
..
eac455e
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.
#
@@
-98,24
+98,22
@@
$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
# 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 maximize
d
the chance
+# will want to have frequent wakeups (eg: hourly) to maximize the chance
# that each laptop is backed up.
#
# Examples:
# $Conf{WakeupSchedule} = [22.5]; # once per day at 10:30 pm.
# that each laptop is backed up.
#
# 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
@@
-201,7
+199,7
@@
$Conf{MaxOldLogFiles} = 14;
# Full path to the df command. Security caution: normal users
# should not allowed to write to this file or directory.
#
# 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:
#
# Command to run df. The following variables are substituted at run-time:
@@
-214,12
+212,11
@@
$Conf{DfCmd} = '$dfPath $topDir';
#
# Full path to various commands for archiving
#
#
# 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.
#
# Maximum threshold for disk utilization on the __TOPDIR__ filesystem.
@@
-648,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';
@@
-698,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';
@@
-912,7
+909,7
@@
$Conf{SmbSharePasswd} = '';
#
# This setting only matters if $Conf{XferMethod} = 'smb'.
#
#
# This setting only matters if $Conf{XferMethod} = 'smb'.
#
-$Conf{SmbClientPath} = '
/usr/bin/smbclient
';
+$Conf{SmbClientPath} = '';
#
# Command to run smbclient for a full dump.
#
# Command to run smbclient for a full dump.
@@
-1091,12
+1088,12
@@
$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host'
#
# This setting only matters if $Conf{XferMethod} = 'tar'.
#
#
# This setting only matters if $Conf{XferMethod} = 'tar'.
#
-$Conf{TarClientPath} = '
/bin/tar
';
+$Conf{TarClientPath} = '';
#
# Path to rsync executable on the client
#
#
# 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
#
# Full command to run rsync on the client machine. The following variables
@@
-1297,7
+1294,7
@@
$Conf{BackupPCdShareName} = '/';
#
# Path to backuppcd executable on the server
#
#
# 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
#
# Full command to run backuppcd on the server to backup a given
@@
-1413,7
+1410,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.
#
# 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
#
# Full path for nmblookup. Security caution: normal users should not
@@
-1422,7
+1419,7
@@
$Conf{SshPath} = '/usr/bin/ssh';
# nmblookup is from the Samba distribution. nmblookup is used to get the
# netbios name, necessary for DHCP hosts.
#
# 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
#
# NmbLookup command. Given an IP address, does an nmblookup on that
@@
-1482,7
+1479,7
@@
$Conf{FixedIPNetBiosNameCheck} = 0;
#
# $Conf{PingPath} = '/bin/echo';
#
#
# $Conf{PingPath} = '/bin/echo';
#
-$Conf{PingPath} = '
/bin/ping
';
+$Conf{PingPath} = '';
#
# Ping command. The following variables are substituted at run-time:
#
# Ping command. The following variables are substituted at run-time:
@@
-1699,7
+1696,7
@@
$Conf{ClientNameAlias} = undef;
# Full path to the sendmail command. Security caution: normal users
# should not allowed to write to this file or directory.
#
# 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.
#
# Minimum period between consecutive emails to a single user.
@@
-1898,8
+1895,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;
@@
-2049,15
+2047,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,