Index: trunk/ippMonitor/raw/site.php
===================================================================
--- trunk/ippMonitor/raw/site.php	(revision 41677)
+++ trunk/ippMonitor/raw/site.php	(revision 41678)
@@ -4,5 +4,5 @@
 // values below are set based on the binary, etc paths.
 
-$WWWHOST    = "ipp117.ifa.hawaii.edu";
+$WWWHOST    = "ipp113.ifa.hawaii.edu";
 
 $PERLLIB    = "/data/ippc64.1/ippitc/psconfig/ipp-20170121.lin64/lib";
@@ -45,104 +45,105 @@
 $DELETION_DELAY  = 15;
 
-$HOST_NEBULOUS  = "nebulous.ipp.ifa.hawaii.edu";
-$USER_NEBULOUS  = "ippMonitor";
-$PASSWORD_NEBULOUS  = "ippMonitor";
-$DBNAME_NEBULOUS  = "ippdb11 nebulous master";
-
-$REPL_HOST_NEBULOUS_SECONDARY  = "ippdb06.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS_SECONDARY  = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS_SECONDARY  = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_SECONDARY  = "ippdb06 nebulous repl2";
-
-$REPL_HOST_NEBULOUS_THIRD  = "ippdb12.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS_THIRD  = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS_THIRD  = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_THIRD  = "ippdb12 nebulous repl3";
-
-$REPL_HOST_NEBULOUS_FOURTH  = "ippdb13.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS_FOURTH  = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS_FOURTH  = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_FOURTH  = "ippdb13 nebulous repl4";
-
-$REPL_HOST_PSTAMP  = "ippc19.IfA.Hawaii.Edu";
-$REPL_USER_PSTAMP  = "ippMonitor";
-$REPL_PASSWORD_PSTAMP  = "ippMonitor";
-$REPL_DBNAME_PSTAMP  = "ippc19 (ippRequestServer)";
-
-$REPL_HOST_ISP  = "ippc17.IfA.Hawaii.Edu";
-$REPL_USER_ISP  = "ippMonitor";
-$REPL_PASSWORD_ISP  = "ippMonitor";
-$REPL_DBNAME_ISP  = "ippc17 (isp)";
-
 $HOST_GPC1  = "ippdb05.IfA.Hawaii.Edu";
 $USER_GPC1  = "ippMonitor";
 $PASSWORD_GPC1  = "ippMonitor";
-$DBNAME_GPC1  = "ippdb05 master db(czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
+$LABEL_GPC1  = "ippdb05 master db(czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
 
 $REPL_HOST_GPC1  = "ippdb01.IfA.Hawaii.Edu";
 $REPL_USER_GPC1  = "ippMonitor";
 $REPL_PASSWORD_GPC1  = "ippMonitor";
-$REPL_DBNAME_GPC1  = "ippdb01 repl1 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
+$REPL_LABEL_GPC1  = "ippdb01 repl1 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
 
 $REPL_HOST_GPC1_SECONDARY  = "ippdb09.IfA.Hawaii.Edu";
 $REPL_USER_GPC1_SECONDARY  = "ippMonitor";
 $REPL_PASSWORD_GPC1_SECONDARY  = "ippMonitor";
-$REPL_DBNAME_GPC1_SECONDARY  = "ippdb09 repl2 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
+$REPL_LABEL_GPC1_SECONDARY  = "ippdb09 repl2 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
 
-$REPL_HOST_GPC1_THIRD  = "ipp116.IfA.Hawaii.Edu";
-$REPL_USER_GPC1_THIRD  = "ippMonitor";
-$REPL_PASSWORD_GPC1_THIRD  = "ippMonitor";
-$REPL_DBNAME_GPC1_THIRD  = "ipp116 repl3 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
+$REPL_HOST_GPC1_TERTIARY = "ipp116.IfA.Hawaii.Edu";
+$REPL_USER_GPC1_TERTIARY = "ippMonitor";
+$REPL_PASSWORD_GPC1_TERTIARY = "ippMonitor";
+$REPL_LABEL_GPC1_TERTIARY = "ipp116 repl3 (czardb, gpc1, gpc2, ippadmin, ipptopsps, megacam, ssp, uip)";
 
-$REPL_HOST_DATASTORE_SECONDARY  = "ipp117.IfA.Hawaii.Edu";
-$REPL_USER_DATASTORE_SECONDARY  = "ipp";
-$REPL_PASSWORD_DATASTORE_SECONDARY  = "ipp";
-$REPL_DBNAME_DATASTORE_SECONDARY  = "ipp117 (datastore replicant)";
+$HOST_NEBULOUS  = "nebulous.ipp.ifa.hawaii.edu";
+$USER_NEBULOUS  = "ippMonitor";
+$PASSWORD_NEBULOUS  = "ippMonitor";
+$LABEL_NEBULOUS  = "ippdb11 nebulous master";
+
+$REPL_HOST_NEBULOUS = "ippdb06.IfA.Hawaii.Edu";
+$REPL_USER_NEBULOUS = "ippMonitor";
+$REPL_PASSWORD_NEBULOUS = "ippMonitor";
+$REPL_LABEL_NEBULOUS = "ippdb06 nebulous repl1";
+
+$REPL_HOST_NEBULOUS_SECONDARY  = "ippdb12.IfA.Hawaii.Edu";
+$REPL_USER_NEBULOUS_SECONDARY  = "ippMonitor";
+$REPL_PASSWORD_NEBULOUS_SECONDARY  = "ippMonitor";
+$REPL_LABEL_NEBULOUS_SECONDARY  = "ippdb12 nebulous repl2";
+
+$REPL_HOST_NEBULOUS_TERTIARY  = "ippdb13.IfA.Hawaii.Edu";
+$REPL_USER_NEBULOUS_TERTIARY  = "ippMonitor";
+$REPL_PASSWORD_NEBULOUS_TERTIARY  = "ippMonitor";
+$REPL_LABEL_NEBULOUS_TERTIARY  = "ippdb13 nebulous repl3";
+
+$HOST_PSTAMP  = "ipp113.IfA.Hawaii.Edu";
+$USER_PSTAMP  = "ipp";
+$PASSWORD_PSTAMP  = "ipp";
+$LABEL_PSTAMP  = "ipp113 (ippRequestServer)";
+
+$REPL_HOST_DATASTORE  = "ipp117.IfA.Hawaii.Edu";
+$REPL_USER_DATASTORE  = "ipp";
+$REPL_PASSWORD_DATASTORE  = "ipp";
+$REPL_LABEL_DATASTORE  = "ipp117 (datastore replicant)";
 
 //Important machines that should be checked for accessibiltiy
 $HOST_GATEWAY  = "ipp113.IfA.Hawaii.Edu";
-$DBNAME_GATEWAY  = "ipp113 (gateway server)";
+$LABEL_GATEWAY  = "ipp113 (gateway server)";
 
 $HOST_GATEWAY_SECONDARY  = "ipp117.IfA.Hawaii.Edu";
-$DBNAME_GATEWAY_SECONDARY  = "ipp117 (gateway backup)";
+$LABEL_GATEWAY_SECONDARY  = "ipp117 (gateway backup)";
+
+$HOST_PROXY  = "ippops1.IfA.Hawaii.Edu";
+$LABEL_PROXY  = "ippops1 (proxy server)";
 
 $HOST_APACHE1  = "ippc33.IfA.Hawaii.Edu";
-$DBNAME_APACHE1  = "ippc33 (apache node)";
+$LABEL_APACHE1  = "ippc33 (apache node)";
 
 $HOST_APACHE2  = "ippc34.IfA.Hawaii.Edu";
-$DBNAME_APACHE2  = "ippc34 (apache node)";
+$LABEL_APACHE2  = "ippc34 (apache node)";
 
 $HOST_APACHE3  = "ippc35.IfA.Hawaii.Edu";
-$DBNAME_APACHE3  = "ippc35 (apache node)";
+$LABEL_APACHE3  = "ippc35 (apache node)";
 
 $HOST_APACHE4  = "ippc43.IfA.Hawaii.Edu";
-$DBNAME_APACHE4  = "ippc43 (apache node)";
+$LABEL_APACHE4  = "ippc43 (apache node)";
 
 $HOST_APACHE5  = "ippc44.IfA.Hawaii.Edu";
-$DBNAME_APACHE5  = "ippc44 (apache node)";
+$LABEL_APACHE5  = "ippc44 (apache node)";
 
 $HOST_APACHE6  = "ippc45.IfA.Hawaii.Edu";
-$DBNAME_APACHE6  = "ippc45 (apache node)";
+$LABEL_APACHE6  = "ippc45 (apache node)";
 
-$HOST_APACHE7  = "ippc36.IfA.Hawaii.Edu";
-$DBNAME_APACHE7 = "ippc36 (backup apache)";
+$HOST_APACHE_BACKUP1  = "ippc36.IfA.Hawaii.Edu";
+$LABEL_APACHE_BACKUP1 = "ippc36 (backup apache)";
 
-$HOST_APACHE8  = "ippc46.IfA.Hawaii.Edu";
-$DBNAME_APACHE8 = "ippc46 (backup apache)";
+$HOST_APACHE_BACKUP2  = "ippc46.IfA.Hawaii.Edu";
+$LABEL_APACHE_BACKUP2 = "ippc46 (backup apache)";
 
-$HOST_PROXY  = "ippops1.IfA.Hawaii.Edu";
-$DBNAME_PROXY  = "ippops1 (proxy server)";
+$HOST_HOME  = "ipphome0.IfA.Hawaii.Edu";
+$LABEL_HOME  = "ipphome0 (ITC homedir)";
+
+$HOST_HOME_BACKUP  = "ipphome0.IfA.Hawaii.Edu";
+$LABEL_HOME_BACKUP  = "ipphome0 (ITC homedir)";
+
+$HOST_NAGIOS  = "ipphome0.IfA.Hawaii.Edu";
+$LABEL_NAGIOS  = "ipphome0 (nagios/ITC home backup)";
 
 $HOST_SVN  = "ippops4.IfA.Hawaii.Edu";
-$DBNAME_SVN  = "ippops4 (svn server)";
+$LABEL_SVN  = "ippops4 (svn server)";
 
 $HOST_CONFLUENCE  = "ippops4.IfA.Hawaii.Edu";
-$DBNAME_CONFLUENCE  = "ippops4 (confluence/JIRA)";
+$LABEL_CONFLUENCE  = "ippops4 (confluence/Jira)";
 
-$HOST_NAGIOS  = "ipphome0.IfA.Hawaii.Edu";
-$DBNAME_NAGIOS  = "ipphome0 (nagios/ITC home backup)";
-
-$HOST_HOME  = "ipphome0.IfA.Hawaii.Edu";
-$DBNAME_HOME  = "ipphome0 (ITC homedir)";
+$HOST_MAILMAN  = "ippops3.IfA.Hawaii.Edu";
+$LABEL_MAILMAN  = "ippops3 (mailman)";
 
 ?>
