Commit ac90303d authored by Leigh Stoller's avatar Leigh Stoller

Add UKY Emulab and fix up iMinds name.

parent 3f826a40
...@@ -39,7 +39,8 @@ $urn_mapping = ...@@ -39,7 +39,8 @@ $urn_mapping =
"urn:publicid:IDN+utahddc.geniracks.net+authority+cm" => "DDC", "urn:publicid:IDN+utahddc.geniracks.net+authority+cm" => "DDC",
"urn:publicid:IDN+stitch.geniracks.net+authority+cm" => "UStitch", "urn:publicid:IDN+stitch.geniracks.net+authority+cm" => "UStitch",
"urn:publicid:IDN+al2s.internet2.edu+authority+am" => "AL2S", "urn:publicid:IDN+al2s.internet2.edu+authority+am" => "AL2S",
"urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm" => "UGent"); "urn:publicid:IDN+uky.emulab.edu+authority+cm" => "UKY",
"urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm" => "Wall2");
$freenodes_mapping = $freenodes_mapping =
array("urn:publicid:IDN+utah.cloudlab.us+authority+cm" => array("urn:publicid:IDN+utah.cloudlab.us+authority+cm" =>
...@@ -326,8 +327,10 @@ class Instance ...@@ -326,8 +327,10 @@ class Instance
"urn:publicid:IDN+emulab.net+authority+cm" "urn:publicid:IDN+emulab.net+authority+cm"
); );
if (ISADMIN()) { if (ISADMIN()) {
$am_array["UGent WALL2"] = $am_array["iMinds Virt Wall 2"] =
"urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm"; "urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm";
$am_array["UKY Emulab"] =
"urn:publicid:IDN+uky.emulab.net+authority+cm";
} }
} else { } else {
$am_array = array( $am_array = array(
......
...@@ -306,7 +306,7 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -306,7 +306,7 @@ function SPITFORM($formfields, $newuser, $errors)
#TEMPORARILY HARD CODED. Used to separate federated sites #TEMPORARILY HARD CODED. Used to separate federated sites
if ($ISCLOUD) { if ($ISCLOUD) {
echo "<script type='text/javascript'>\n"; echo "<script type='text/javascript'>\n";
echo " window.FEDERATEDLIST = ['IG UtahDDC', 'Emulab', 'APT Utah', 'UGent WALL2'];\n"; echo " window.FEDERATEDLIST = ['IG UtahDDC', 'Emulab', 'APT Utah', 'iMinds Virt Wall 2', 'UKY Emulab'];\n";
echo "</script>\n"; echo "</script>\n";
} }
......
...@@ -123,7 +123,11 @@ function maketopmap(divname, xml, showinfo, withoutMultiSite) ...@@ -123,7 +123,11 @@ function maketopmap(divname, xml, showinfo, withoutMultiSite)
}, },
{ {
"id": "urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm", "id": "urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm",
"name": "UGent WALL2" "name": "iMinds Virt Wall 2"
},
{
"id": "urn:publicid:IDN+uky.emulab.net+authority+cm",
"name": "UKY Emulab"
} }
] ]
} }
......
...@@ -1825,7 +1825,7 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal, ...@@ -1825,7 +1825,7 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
}, },
{ {
"id": "urn:publicid:IDN+apt.emulab.net+authority+cm", "id": "urn:publicid:IDN+apt.emulab.net+authority+cm",
"name": "Apt Utah" "name": "APT Utah"
}, },
{ {
"id": "urn:publicid:IDN+emulab.net+authority+cm", "id": "urn:publicid:IDN+emulab.net+authority+cm",
...@@ -1833,7 +1833,11 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal, ...@@ -1833,7 +1833,11 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
}, },
{ {
"id": "urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm", "id": "urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm",
"name": "UGent WALL2" "name": "iMinds Virt Wall 2"
},
{
"id": "urn:publicid:IDN+uky.emulab.net+authority+cm",
"name": "UKY Emulab"
} }
] ]
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment