Merge branch 'develop' into iss1393-update-keys

Author: tcmitchell

CHANGES.md

@@ -6,6 +6,10 @@
 
 * Provide a way to update SSH keys on existing resources
   ([#1393](https://github.com/GENI-NSF/geni-portal/issues/1393))
+* Add some notes to geni-fetch-aggmon for testing
+  ([#1703](https://github.com/GENI-NSF/geni-portal/issues/1703))
+* Update the Jacks URL per Emulab's request
+  ([#1704](https://github.com/GENI-NSF/geni-portal/issues/1704))
 
 ## Installation Notes
 

lib/php/settings.php.in

@@ -51,7 +51,7 @@ $portal_version = "@VERSION@";
 
 // URL to the Jacks root
 // Stable
-$jacks_stable_url = "https://www.emulab.net/protogeni/jacks-stable/js/jacks";
+$jacks_stable_url = "https://www.emulab.net/protogeni/jacks-stable/js/jacks.js";
 //$jacks_stable_url = "https://portal.geni.net/jacks-stable/js/jacks";
 
 // Sources for external libraries the portal uses

sbin/geni-fetch-aggmon.in

@@ -2,6 +2,14 @@
 
 # Monitoring API: http://groups.geni.net/geni/wiki/GENIMonitoring/API
 
+# ----------------------------------------------------------------------
+# TO DO:
+#  * Add a command option to override the BASE_URL so that the
+#    development server, for instance, could be used without changes
+#  * Add a command line option to allow verbose output to enable
+#    debugging
+# ----------------------------------------------------------------------
+
 import urllib
 import urllib2
 import json
@@ -11,6 +19,11 @@ import pprint
 import sys
 import argparse
 
+# --------------------------------------------------
+# For testing use the development server BASE_URL:
+#   http://genimondev.uky.edu/API'
+# --------------------------------------------------
+
 BASE_URL = 'http://genimon.uky.edu/API'
 INFO_URL = '%s/info/' % (BASE_URL)
 DATA_URL = '%s/data/' % (BASE_URL)