projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- config and host editing pretty much done
[BackupPC.git]
/
conf
/
config.pl
diff --git
a/conf/config.pl
b/conf/config.pl
index
d8b6ac9
..
03c28b5
100644
(file)
--- a/
conf/config.pl
+++ b/
conf/config.pl
@@
-547,6
+547,9
@@
$Conf{ArchiveInfoKeepCnt} = 10;
# array, and $Conf{SmbShareName} contains multiple share names, then
# the setting is assumed to apply all shares.
#
# array, and $Conf{SmbShareName} contains multiple share names, then
# the setting is assumed to apply all shares.
#
+# If a hash is used, a special key "*" means it applies to all
+# shares.
+#
# Examples:
# $Conf{BackupFilesOnly} = '/myFiles';
# $Conf{BackupFilesOnly} = ['/myFiles']; # same as first example
# Examples:
# $Conf{BackupFilesOnly} = '/myFiles';
# $Conf{BackupFilesOnly} = ['/myFiles']; # same as first example
@@
-555,6
+558,10
@@
$Conf{ArchiveInfoKeepCnt} = 10;
# 'c' => ['/myFiles', '/important'], # these are for 'c' share
# 'd' => ['/moreFiles', '/archive'], # these are for 'd' share
# };
# 'c' => ['/myFiles', '/important'], # these are for 'c' share
# 'd' => ['/moreFiles', '/archive'], # these are for 'd' share
# };
+# $Conf{BackupFilesOnly} = {
+# 'c' => ['/myFiles', '/important'], # these are for 'c' share
+# '*' => ['/myFiles', '/important'], # these are other shares
+# };
#
$Conf{BackupFilesOnly} = undef;
#
$Conf{BackupFilesOnly} = undef;
@@
-590,6
+597,9
@@
$Conf{BackupFilesOnly} = undef;
# Users report that for smbclient you should specify a directory
# followed by "/*", eg: "/proc/*", instead of just "/proc".
#
# Users report that for smbclient you should specify a directory
# followed by "/*", eg: "/proc/*", instead of just "/proc".
#
+# If a hash is used, a special key "*" means it applies to all
+# shares.
+#
# Examples:
# $Conf{BackupFilesExclude} = '/temp';
# $Conf{BackupFilesExclude} = ['/temp']; # same as first example
# Examples:
# $Conf{BackupFilesExclude} = '/temp';
# $Conf{BackupFilesExclude} = ['/temp']; # same as first example
@@
-598,6
+608,10
@@
$Conf{BackupFilesOnly} = undef;
# 'c' => ['/temp', '/winnt/tmp'], # these are for 'c' share
# 'd' => ['/junk', '/dont_back_this_up'], # these are for 'd' share
# };
# 'c' => ['/temp', '/winnt/tmp'], # these are for 'c' share
# 'd' => ['/junk', '/dont_back_this_up'], # these are for 'd' share
# };
+# $Conf{BackupFilesExclude} = {
+# 'c' => ['/temp', '/winnt/tmp'], # these are for 'c' share
+# '*' => ['/junk', '/dont_back_this_up'], # these are for other shares
+# };
#
$Conf{BackupFilesExclude} = undef;
#
$Conf{BackupFilesExclude} = undef;
@@
-705,7
+719,7
@@
$Conf{BackupZeroFilesIsFatal} = 1;
# - 'rsync': backup and restore via rsync (via rsh or ssh).
# Best choice for linux/unix. Good choice also for 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.
+# - 'rsyncd': backup and rest
o
re via rsync daemon on the client.
# Best choice for linux/unix if you have rsyncd running on
# the client. Good choice also for WinXX.
#
# Best choice for linux/unix if you have rsyncd running on
# the client. Good choice also for WinXX.
#
@@
-880,7
+894,7
@@
$Conf{TarShareName} = '/';
# This setting only matters if $Conf{XferMethod} = 'tar'.
#
$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host'
# This setting only matters if $Conf{XferMethod} = 'tar'.
#
$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host'
- . ' $tarPath -c -v -f - -C $shareName+'
+ . '
env LC_ALL=C
$tarPath -c -v -f - -C $shareName+'
. ' --totals';
#
. ' --totals';
#
@@
-937,7
+951,7
@@
$Conf{TarIncrArgs} = '--newer=$incrDate+ $fileList+';
# restore option will be removed.
#
$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host'
# restore option will be removed.
#
$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host'
- . ' $tarPath -x -p --numeric-owner --same-owner'
+ . '
env LC_ALL=C
$tarPath -x -p --numeric-owner --same-owner'
. ' -v -f - -C $shareName+';
#
. ' -v -f - -C $shareName+';
#
@@
-1344,7
+1358,7
@@
$Conf{CompressLevel} = 0;
# Despite the name, this parameter sets the timeout for all transport
# methods (tar, smb etc).
#
# Despite the name, this parameter sets the timeout for all transport
# methods (tar, smb etc).
#
-$Conf{ClientTimeout} = 7200;
+$Conf{ClientTimeout} = 7200
0
;
#
# Maximum number of log files we keep around in each PC's directory
#
# Maximum number of log files we keep around in each PC's directory
@@
-1583,6
+1597,14
@@
$Conf{EMailNotifyOldOutlookDays} = 5.0;
$Conf{EMailOutlookBackupSubj} = undef;
$Conf{EMailOutlookBackupMesg} = undef;
$Conf{EMailOutlookBackupSubj} = undef;
$Conf{EMailOutlookBackupMesg} = undef;
+#
+# Additional email headers
+#
+$Conf{EMailHeaders} = <<EOF;
+MIME-Version: 1.0
+Content-Type: text/plain; charset="iso-8859-1"
+EOF
+
###########################################################################
# CGI user interface configuration settings
# (can be overridden in the per-PC config.pl)
###########################################################################
# CGI user interface configuration settings
# (can be overridden in the per-PC config.pl)
@@
-1751,6
+1773,11
@@
$Conf{CgiImageDirURL} = '';
#
$Conf{CgiCSSFile} = 'BackupPC_stnd.css';
#
$Conf{CgiCSSFile} = 'BackupPC_stnd.css';
+#
+# Whether the user is allowed to edit their per-PC config.
+#
+$Conf{CgiUserConfigEditEnable} = 1;
+
#
# Which per-host config variables a non-admin user is allowed
# to edit.
#
# Which per-host config variables a non-admin user is allowed
# to edit.
@@
-1811,4
+1838,5
@@
$Conf{CgiUserConfigEdit} = {
EMailNotifyOldOutlookDays => 1,
EMailOutlookBackupSubj => 1,
EMailOutlookBackupMesg => 1,
EMailNotifyOldOutlookDays => 1,
EMailOutlookBackupSubj => 1,
EMailOutlookBackupMesg => 1,
+ EMailHeaders => 1,
};
};