X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=conf%2Fconfig.pl;h=54e0f5b0c0ddd09f7e4696f494f955bac9521348;hb=e4a233559926fe41888b2f6c5cc716401b715162;hp=8b0e00cd5ccd21e2503a02511a4c61a0c39234d3;hpb=c6cebe03e53dcc49f889cf15ccda5b0fe3acd235;p=BackupPC.git

diff --git a/conf/config.pl b/conf/config.pl
index 8b0e00c..54e0f5b 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -454,11 +454,13 @@ $Conf{BackupFilesOnly} = undef;
 # For tar, if the exclude file contains a "/" it is assumed to be anchored
 # 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
+# that GNU tar version >= 1.13.7 is required for the exclude option to
 # 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}.
+# $Conf{RsyncArgs}.  Also, for tar, do not use a trailing "/" in
+# the directory name: a trailing "/" causes the name to not match
+# and the directory will not be excluded.
 #
 # Examples:
 #    $Conf{BackupFilesExclude} = '/temp';
@@ -903,6 +905,10 @@ $Conf{PingPath} = '/bin/ping';
 #   $pingPath      path to ping ($Conf{PingPath})
 #   $host          host name
 #
+# Wade Brown reports that on solaris 2.6 and 2.7 ping -s returns the wrong
+# exit status (0 even on failure).  Replace with "ping $host 1", which
+# gets the correct exit status but we don't get the round-trip time.
+#
 $Conf{PingCmd} = '$pingPath -c 1 $host';
 
 #
@@ -995,13 +1001,15 @@ $Conf{RestorePostUserCmd} = undef;
 
 #
 # Override the client's host name.  This allows multiple clients
-# to all refer to the same physical hostj.  This should only be
+# to all refer to the same physical host.  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:
+# everywhere else in BackupPC).  The setting can be a host name or
+# IP address, eg:
 #
 #         $Conf{ClientNameAlias} = 'realHostName';
+#         $Conf{ClientNameAlias} = '192.1.1.15';
 #
 # will cause the relevant smb/tar/rsync backup/restore commands to be
 # directed to realHostName, not the client name.
@@ -1179,7 +1187,9 @@ $Conf{CgiURL} = undef;
 
 #   
 # Language to use.  See lib/BackupPC/Lang for the list of supported
-# languages, which include English (en), French (fr), and Spanish (es).
+# languages, which include English (en), French (fr), Spanish (es),
+# and German (de).
+#
 # Currently the Language setting applies to the CGI interface and email
 # messages sent to users.  Log files and other text is still in English.
 #
@@ -1239,6 +1249,17 @@ $Conf{CgiNavBarBgColor} = '#ddeeee';
 $Conf{CgiHeaderBgColor} = '#99cc33';
 $Conf{CgiBodyBgColor}   = '#ffffff';
 
+#
+# Hilight colors based on status that are used in the PC summary page.
+#
+$Conf{CgiStatusHilightColor} = {
+    Reason_backup_failed           => '#ffcccc',
+    Reason_backup_done             => '#ccffcc',
+    Reason_no_ping                 => '#ffff99',
+    Reason_backup_in_progress      => '#66cc99',
+    Reason_backup_canceled_by_user => '#ff9900',
+};
+
 #
 # Additional CGI header text.  For example, if you wanted each CGI page
 # to auto refresh every 900 seconds, you could add this text: