Index: trunk/ippMonitor/config.dat.in
===================================================================
--- trunk/ippMonitor/config.dat.in	(revision 40852)
+++ trunk/ippMonitor/config.dat.in	(revision 41679)
@@ -17,92 +17,106 @@
 $CZARPLOTDIR = "";
 
-// Temporary files belonging to DELETION_USER and older than
-// DELETION_DELAY minutes will be delayed by the
-// delete_old_tmp_files() function (see raw/ipp.php)
-
 $DELETION_USER   = "";
 $DELETION_DELAY  =5;
+
+$HOST_GPC1  = "";
+$USER_GPC1  = "";
+$PASSWORD_GPC1  = "";
+$LABEL_GPC1  = "";
+
+$REPL_HOST_GPC1  = "";
+$REPL_USER_GPC1  = "";
+$REPL_PASSWORD_GPC1  = "";
+$REPL_LABEL_GPC1  = "";
+
+$REPL_HOST_GPC1_SECONDARY  = "";
+$REPL_USER_GPC1_SECONDARY  = "";
+$REPL_PASSWORD_GPC1_SECONDARY  = "";
+$REPL_LABEL_GPC1_SECONDARY  = "";
+
+$REPL_HOST_GPC1_TERTIARY = "";
+$REPL_USER_GPC1_TERTIARY = "";
+$REPL_PASSWORD_GPC1_TERTIARY = "";
+$REPL_LABEL_GPC1_TERTIARY = "";
 
 $HOST_NEBULOUS  = "";
 $USER_NEBULOUS  = "";
 $PASSWORD_NEBULOUS  = "";
-$DBNAME_NEBULOUS  = "";
+$LABEL_NEBULOUS  = "";
 
 $REPL_HOST_NEBULOUS  = "";
 $REPL_USER_NEBULOUS  = "";
 $REPL_PASSWORD_NEBULOUS  = "";
-$REPL_DBNAME_NEBULOUS  = "";
+$REPL_LABEL_NEBULOUS  = "";
 
 $REPL_HOST_NEBULOUS_SECONDARY  = "";
 $REPL_USER_NEBULOUS_SECONDARY  = "";
 $REPL_PASSWORD_NEBULOUS_SECONDARY  = "";
-$REPL_DBNAME_NEBULOUS_SECONDARY  = "";
+$REPL_LABEL_NEBULOUS_SECONDARY  = "";
+
+$REPL_HOST_NEBULOUS_TERTIARY  = "";
+$REPL_USER_NEBULOUS_TERTIARY  = "";
+$REPL_PASSWORD_NEBULOUS_TERTIARY  = "";
+$REPL_LABEL_NEBULOUS_TERTIARY  = "";
 
 $REPL_HOST_PSTAMP  = "";
 $REPL_USER_PSTAMP  = "";
 $REPL_PASSWORD_PSTAMP  = "";
-$REPL_DBNAME_PSTAMP  = "";
+$REPL_LABEL_PSTAMP  = "";
 
-$REPL_HOST_ISP  = "";
-$REPL_USER_ISP  = "";
-$REPL_PASSWORD_ISP  = "";
-$REPL_DBNAME_ISP  = "";
-
-$HOST_GPC1  = "";
-$USER_GPC1  = "";
-$PASSWORD_GPC1  = "";
-$DBNAME_GPC1  = "";
-
-$REPL_HOST_GPC1  = "";
-$REPL_USER_GPC1  = "";
-$REPL_PASSWORD_GPC1  = "";
-$REPL_DBNAME_GPC1  = "";
-
-$REPL_HOST_GPC1_SECONDARY  = "";
-$REPL_USER_GPC1_SECONDARY  = "";
-$REPL_PASSWORD_GPC1_SECONDARY  = "";
-$REPL_DBNAME_GPC1_SECONDARY  = "";
-
-$REPL_HOST_DATASTORE_SECONDARY  = "";
-$REPL_USER_DATASTORE_SECONDARY  = "";
-$REPL_PASSWORD_DATASTORE_SECONDARY  = "";
-$REPL_DBNAME_DATASTORE_SECONDARY  = "";
+$REPL_HOST_DATASTORE  = "";
+$REPL_USER_DATASTORE  = "";
+$REPL_PASSWORD_DATASTORE  = "";
+$REPL_LABEL_DATASTORE  = "";
 
 //Important machines that should be checked for accessibiltiy
 $HOST_GATEWAY  = "";
-$DBNAME_GATEWAY  = "";
+$LABEL_GATEWAY  = "";
 
 $HOST_GATEWAY_SECONDARY  = "";
-$DBNAME_GATEWAY_SECONDARY  = "";
+$LABEL_GATEWAY_SECONDARY  = "";
+
+$HOST_PROXY  = "";
+$LABEL_PROXY  = "";
 
 $HOST_APACHE1  = "";
-$DBNAME_APACHE1  = "";
+$LABEL_APACHE1  = "";
 
 $HOST_APACHE2  = "";
-$DBNAME_APACHE2  = "";
+$LABEL_APACHE2  = "";
 
 $HOST_APACHE3  = "";
-$DBNAME_APACHE3  = "";
+$LABEL_APACHE3  = "";
 
 $HOST_APACHE4  = "";
-$DBNAME_APACHE4  = "";
+$LABEL_APACHE4  = "";
 
 $HOST_APACHE5  = "";
-$DBNAME_APACHE5  = "";
+$LABEL_APACHE5  = "";
 
 $HOST_APACHE6  = "";
-$DBNAME_APACHE6  = "";
+$LABEL_APACHE6  = "";
 
-$HOST_APACHE7  = "";
-$DBNAME_APACHE7  = "";
+$HOST_APACHE_BACKUP1  = ";"
+$LABEL_APACHE_BACKUP1  = ";"
 
-$HOST_PROXY  = "";
-$DBNAME_PROXY  = "";
+$HOST_APACHE_BACKUP2  = ";"
+$LABEL_APACHE_BACKUP2  = ";"
+
+$HOST_HOME  = "";
+$LABEL_HOME  = "";
+
+$HOST_HOME_BACKUP  = "";
+$LABEL_HOME_BACKUP  = "";
+
+$HOST_NAGIOS  = "";
+$LABEL_NAGIOS  = "";
 
 $HOST_SVN  = "";
-$DBNAME_SVN  = "";
+$LABEL_SVN  = "";
 
 $HOST_CONFLUENCE  = "";
-$DBNAME_CONFLUENCE  = "";
+$LABEL_CONFLUENCE  = "";
 
-
+$HOST_MAILMAN  = "";
+$LABEL_MAILMAN  = "";