projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes, including changes in 2.1.1 and 2.1.2 releases.
[BackupPC.git]
/
conf
/
config.pl
diff --git
a/conf/config.pl
b/conf/config.pl
index
d8b6ac9
..
1284c5d
100644
(file)
--- a/
conf/config.pl
+++ b/
conf/config.pl
@@
-705,7
+705,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
+880,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
+937,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
+1344,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
+1583,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)
@@
-1811,4
+1819,5
@@
$Conf{CgiUserConfigEdit} = {
EMailNotifyOldOutlookDays => 1,
EMailOutlookBackupSubj => 1,
EMailOutlookBackupMesg => 1,
EMailNotifyOldOutlookDays => 1,
EMailOutlookBackupSubj => 1,
EMailOutlookBackupMesg => 1,
+ EMailHeaders => 1,
};
};