X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=conf%2Fconfig.pl;h=8b0e00cd5ccd21e2503a02511a4c61a0c39234d3;hb=b6e98cb4e11dcc0d73163ee57509aeec2b6013d3;hp=0f73ec69f67d8a8879964f8913fdeefd68d21de8;hpb=9175f9157f0d54b50ebf11d2036c20f50ffc6d9d;p=BackupPC.git

diff --git a/conf/config.pl b/conf/config.pl
index 0f73ec6..8b0e00c 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -180,6 +180,8 @@ $Conf{TrashCleanSleepSec} = 300;
 #
 # List of DHCP address ranges we search looking for PCs to backup.
 # This is an array of hashes for each class C address range.
+# This is only needed if hosts in the conf/hosts file have the
+# dhcp flag set.
 #
 # Examples:
 #    # to specify 192.10.10.20 to 192.10.10.250 as the DHCP address pool
@@ -291,6 +293,14 @@ $Conf{SmbSharePasswd} = '';
 # use this option instead of $Conf{TarShareName} since a new tar is
 # run for each entry in $Conf{TarShareName}.
 #
+# On the other hand, if you add --one-file-system to $Conf{TarClientCmd}
+# you can backup each file system separately, which makes restoring one
+# bad file system easier.  In this case you would list all of the mount
+# points here, since you can't get the same result with
+# $Conf{BackupFilesOnly}:
+#
+#     $Conf{TarShareName} = ['/', '/var', '/data', '/boot'];
+#
 # This setting only matters if $Conf{XferMethod} = 'tar'.
 #
 $Conf{TarShareName} = '/';
@@ -419,7 +429,7 @@ $Conf{RestoreInfoKeepCnt} = 10;
 #    $Conf{BackupFilesOnly} = {
 #       'c' => ['/myFiles', '/important'],      # these are for 'c' share
 #       'd' => ['/moreFiles', '/archive'],      # these are for 'd' share
-#    }
+#    };
 #
 $Conf{BackupFilesOnly} = undef;
 
@@ -445,8 +455,10 @@ $Conf{BackupFilesOnly} = undef;
 # at the start of the string.  Since all the tar paths start with "./",
 # BackupPC prepends a "." if the exclude file starts with a "/".  Note
 # that GNU tar version >= 1.3.7 is required for the exclude option to
-# work correctly.  For linux or unix machines it is recommended to add
-# "/proc" to $Conf{BackupFilesExclude}.
+# work correctly.  For linux or unix machines you should add
+# "/proc" to $Conf{BackupFilesExclude} unless you have specified
+# --one-file-system in $Conf{TarClientCmd} or --one-file-system in
+# $Conf{RsyncArgs}.
 #
 # Examples:
 #    $Conf{BackupFilesExclude} = '/temp';
@@ -613,6 +625,9 @@ $Conf{TarClientCmd} = '$sshPath -q -n -l root $host'
 # Extra tar arguments for full backups.  Several variables are substituted at
 # run-time.  See $Conf{TarClientCmd} for the list of variable substitutions.
 #
+# If you are running tar locally (ie: without rsh or ssh) then remove the
+# "+" so that the argument is no longer shell escaped.
+#
 # This setting only matters if $Conf{XferMethod} = 'tar'.
 #
 $Conf{TarFullArgs} = '$fileList+';
@@ -639,6 +654,9 @@ $Conf{TarFullArgs} = '$fileList+';
 #          attribute change, meaning the file will always be included
 #          in each new incremental dump.
 #
+# If you are running tar locally (ie: without rsh or ssh) then remove the
+# "+" so that the argument is no longer shell escaped.
+#
 # This setting only matters if $Conf{XferMethod} = 'tar'.
 #
 $Conf{TarIncrArgs} = '--newer=$incrDate+ $fileList+';
@@ -705,9 +723,18 @@ $Conf{RsyncClientRestoreCmd} = '$sshPath -l root $host $rsyncPath $argList';
 
 #
 # Share name to backup.  For $Conf{XferMethod} = "rsync" this should
-# be a directory name, eg '/' or '/home'.  For $Conf{XferMethod} = "rsyncd"
-# this should be the name of the module to backup (ie: the name from
-# /etc/rsynd.conf).
+# be a file system path, eg '/' or '/home'.
+#
+# For $Conf{XferMethod} = "rsyncd" this should be the name of the module
+# to backup (ie: the name from /etc/rsynd.conf).
+#
+# This can also be a list of multiple file system paths or modules.
+# For example, by adding --one-file-system to $Conf{RsyncArgs} you
+# can backup each file system separately, which makes restoring one
+# bad file system easier.  In this case you would list all of the mount
+# points:
+#
+#     $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot'];
 #
 $Conf{RsyncShareName} = '/';
 
@@ -826,7 +853,10 @@ $Conf{NmbLookupPath} = '/usr/bin/nmblookup';
 # IP address.  Several variables are substituted at run-time:
 #
 #   $nmbLookupPath      path to nmblookup ($Conf{NmbLookupPath})
-#   $host               host name
+#   $host               IP address
+#
+# This command is only used for DHCP hosts: given an IP address, this
+# command should try to find its NetBios name.
 #
 $Conf{NmbLookupCmd} = '$nmbLookupPath -A $host';
 
@@ -965,10 +995,18 @@ $Conf{RestorePostUserCmd} = undef;
 
 #
 # Override the client's host name.  This allows multiple clients
-# to all refer to the same physical hosts.  This should only be
-# set in the per-PC config file.
+# to all refer to the same physical hostj.  This should only be
+# set in the per-PC config file and is only used by BackupPC at
+# the last moment prior to generating the command used to backup
+# that machine (ie: the value of $Conf{ClientNameAlias} is invisible
+# everywhere else in BackupPC).  Eg:
+#
+#         $Conf{ClientNameAlias} = 'realHostName';
+#
+# will cause the relevant smb/tar/rsync backup/restore commands to be
+# directed to realHostName, not the client name.
 #
-# Note: this setting doesn't work for DHCP hosts.
+# Note: this setting doesn't work for hosts with DHCP set to 1.
 #
 $Conf{ClientNameAlias} = undef;
 
@@ -1141,9 +1179,9 @@ $Conf{CgiURL} = undef;
 
 #   
 # Language to use.  See lib/BackupPC/Lang for the list of supported
-# languages, which includes English (en) and French (fr).  Currently
-# this applies mainly to the CGI interface, but over time it might
-# also include log files and other text output.
+# languages, which include English (en), French (fr), and Spanish (es).
+# Currently the Language setting applies to the CGI interface and email
+# messages sent to users.  Log files and other text is still in English.
 #
 $Conf{Language} = 'en';