Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 13097)
+++ trunk/psModules/src/config/pmConfig.c	(revision 13101)
@@ -4,6 +4,6 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-01 03:15:35 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-01 03:53:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1168,15 +1168,24 @@
 
         bool status = false;
-        psString nebulous_server = psMetadataLookupStr(&status, config->site, "NEBULOUS_SERVER");
-        if (!status) {
-            psError(PM_ERR_CONFIG, true, "failed to lookup config value for NEBULOUS_SERVER.");
-            return NULL;
-        }
-        if (!nebulous_server) {
+        psString neb_server = NULL;
+
+        // check the env first
+        neb_server = getenv("NEB_SERVER");
+
+        // if env isn't set, check the config system
+        if (!neb_server) {
+            neb_server = psMetadataLookupStr(&status, config->site, "NEB_SERVER");
+            if (!status) {
+                psError(PM_ERR_CONFIG, true, "failed to lookup config value for NEB_SERVER.");
+                return NULL;
+            }
+        }
+
+        if (!neb_server) {
             psError(PM_ERR_CONFIG, true, "Could not determine nebulous server URI.");
             return NULL;
         }
 
-        nebServer *server = nebServerAlloc(nebulous_server);
+        nebServer *server = nebServerAlloc(neb_server);
         if (!server) {
             psError(PM_ERR_SYS, true, "failed to create a nebServer object: %s", nebErr(server));