--- trunk/conf/config.pl	2005/11/08 20:24:45	234
+++ trunk/conf/config.pl	2006/04/27 09:35:41	355
@@ -741,7 +741,7 @@
 #   - '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 restore via rsync daemon on the client.
 #                Best choice for linux/unix if you have rsyncd running on
 #                the client.  Good choice also for WinXX.
 #
@@ -1337,7 +1337,7 @@
 # Despite the name, this parameter sets the timeout for all transport
 # methods (tar, smb etc).
 #
-$Conf{ClientTimeout} = 7200;
+$Conf{ClientTimeout} = 72000;
 
 #
 # Maximum number of log files we keep around in each PC's directory
@@ -1510,7 +1510,7 @@
 #   To: $user$domain
 #   cc:
 #   Subject: $subj
-#   
+#   $headers
 #   Dear $userName,
 #   
 #   This is a site-specific email message.
@@ -1538,7 +1538,7 @@
 #   To: $user$domain
 #   cc:
 #   Subject: $subj
-#   
+#   $headers
 #   Dear $userName,
 #   
 #   This is a site-specific email message.
@@ -1566,7 +1566,7 @@
 #   To: $user$domain
 #   cc:
 #   Subject: $subj
-#   
+#   $headers
 #   Dear $userName,
 #   
 #   This is a site-specific email message.
@@ -1749,10 +1749,12 @@
 $Conf{SearchDSN} = 'dbi:Pg:dbname=backuppc';
 $Conf{SearchUser} = 'dpavlin';
 #
-# if you want to use experimental HyperEstraier support (which require
-# installation of HyperEstraier and swig binding for perl) select
+# if you want to use experimental Hyper Estraier support (which require
+# installation of Search::Estraier perl module from CPAN) select
 # path to index (relative to $TopDir) or node URI
-#$Conf{HyperEstraierIndex} = '/casket/';
+# use following line to disable Hyper Estraier and prevent upgrades
+# from overwriting it
+#$Conf{HyperEstraierIndex} = '';
 $Conf{HyperEstraierIndex} = 'http://localhost:1978/node/backuppc';
 
 #
@@ -1768,21 +1770,17 @@
 #
 $Conf{GzipSchema} = '\h_\s_\n';
 #
-# schema for part which will be added to GzipSchema (before .tar.gz)
-# (if file is bigger than MaxArchiveFileSize)
-#
-$Cont{GzipSchemaPart} = '-\p';
 
 #
-# archive media size (in kb)
+# archive media size (in bytes)
 # default: 4.2Gb for DVD
 #
-$Conf{MaxArchiveSize} = 4200 * 1024;
+$Conf{MaxArchiveSize} = 4200 * 1024 * 1024;
 
 #
-# maximum size of one (uncompressed) file on archive medium (in kb)
+# maximum size of one (uncompressed) file on archive medium (in bytes)
 # default: 2Gb - 2k for DVD
-$Conf{MaxArchiveFileSize} = (2048 - 2) * 1024;
+$Conf{MaxArchiveFileSize} = (2048 - 2) * 1024 * 1024;
 
 #
 # Temporary directory for ISO images (relative to install dir)
@@ -1811,3 +1809,7 @@
 $Conf{ejectOpts} = '/dev/cdrom';
 
 $Conf{mkisofsBin} = 'mkisofs';
+
+# temporary path used when recovering of increments
+# (you might put this into tmpfs if you have enough RAM)
+$Conf{IncrementTempDir} = '/tmp/increment-restore/';