Commit f0f98445 authored by Leigh B Stoller's avatar Leigh B Stoller

Merge remote-tracking branch 'central/master' into imagealiases

parents 1c382a57 eb5061a0
...@@ -407,6 +407,10 @@ FRISEBEENUMPORTS=100 ...@@ -407,6 +407,10 @@ FRISEBEENUMPORTS=100
# #
NOSTACKMIB=0 NOSTACKMIB=0
# Image versioning and deltas.
IMAGEPROVENANCE=1
IMAGEDELTAS=0
# ZFS -- added by hibler 12/17/15 # ZFS -- added by hibler 12/17/15
WITHZFS=1 WITHZFS=1
ZFS_ROOT=storage ZFS_ROOT=storage
...@@ -449,3 +453,29 @@ DISABLE_NSE=1 ...@@ -449,3 +453,29 @@ DISABLE_NSE=1
# Sometimes the main page is down in a directory on WWWHOST # Sometimes the main page is down in a directory on WWWHOST
# No trailing '/'! # No trailing '/'!
#WWW=www.example.emulab.net/emulab-www #WWW=www.example.emulab.net/emulab-www
#
# Various Cloudlab/Federation stuff.
#
PROTOGENI_SUPPORT=1
PROTOGENI_DOMAIN="onelab"
PROTOGENI_LOCALUSER=1
PROTOGENI_GENIWEBLOGIN=0
PROTOGENI_MAXSERVERLOAD=24
PROTOGENI_NONFSMOUNTS=0
# Portal for the Cloudlab Cluster.
CLUSTER_PORTAL="boss.emulab.net"
CLUSTER_PUBSUBD_PORT=16506
FANCYBANNER=1
ISOLATEADMINS=0
#
# Fancy new browser in the console support
#
BROWSER_CONSOLE_ENABLE=1
#
# If enabled, needs setup, see:
# http://users.emulab.net/trac/emulab/wiki/NodeUsageInstall
#
NODE_USAGE_SUPPORT=1
...@@ -94,7 +94,8 @@ sub CheckPermission() ...@@ -94,7 +94,8 @@ sub CheckPermission()
$OURDOMAIN eq "apt.emulab.net" || $OURDOMAIN eq "apt.emulab.net" ||
$OURDOMAIN eq "utah.cloudlab.us" || $OURDOMAIN eq "utah.cloudlab.us" ||
$OURDOMAIN eq "wisc.cloudlab.us" || $OURDOMAIN eq "wisc.cloudlab.us" ||
$OURDOMAIN eq "clemson.cloudlab.us")); $OURDOMAIN eq "clemson.cloudlab.us" ||
$OURDOMAIN eq "lab.onelab.eu"));
return 0; return 0;
} }
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2008-2011 University of Utah and the Flux Group. # Copyright (c) 2008-2011, 2016 University of Utah and the Flux Group.
# #
# {{{GENIPUBLIC-LICENSE # {{{GENIPUBLIC-LICENSE
# #
...@@ -38,12 +38,13 @@ use Getopt::Std; ...@@ -38,12 +38,13 @@ use Getopt::Std;
# #
sub usage() sub usage()
{ {
print "Usage: addauthority [-c] [-a] [-n] <certfile> <type> [url]\n"; print "Usage: addauthority [-c | -a | -s] [-n] <certfile> <type> [url]\n";
exit(1); exit(1);
} }
my $optlist = "acnf"; my $optlist = "acnfs";
my $asch = 0; my $asch = 0;
my $asam = 0; my $asam = 0;
my $assa = 0;
my $disable = 0; my $disable = 0;
my $force = 0; my $force = 0;
...@@ -63,6 +64,9 @@ if (defined($options{"c"})) { ...@@ -63,6 +64,9 @@ if (defined($options{"c"})) {
if (defined($options{"a"})) { if (defined($options{"a"})) {
$asam = 1; $asam = 1;
} }
if (defined($options{"s"})) {
$assa = 1;
}
if (defined($options{"f"})) { if (defined($options{"f"})) {
$force = 1; $force = 1;
} }
...@@ -80,6 +84,9 @@ if ($asch) { ...@@ -80,6 +84,9 @@ if ($asch) {
elsif ($asam) { elsif ($asam) {
$GENI_DBNAME = "geni-cm"; $GENI_DBNAME = "geni-cm";
} }
elsif ($assa) {
$GENI_DBNAME = "geni";
}
# Now we can load the libraries after setting the proper DB. # Now we can load the libraries after setting the proper DB.
use lib '@prefix@/lib'; use lib '@prefix@/lib';
......
...@@ -53,7 +53,8 @@ if ($TBMAINSITE) { ...@@ -53,7 +53,8 @@ if ($TBMAINSITE) {
"APT" => "urn:publicid:IDN+apt.emulab.net+authority+cm", "APT" => "urn:publicid:IDN+apt.emulab.net+authority+cm",
"Wisconsin" => "urn:publicid:IDN+wisc.cloudlab.us+authority+cm", "Wisconsin" => "urn:publicid:IDN+wisc.cloudlab.us+authority+cm",
"Clemson" => "urn:publicid:IDN+clemson.cloudlab.us+authority+cm", "Clemson" => "urn:publicid:IDN+clemson.cloudlab.us+authority+cm",
"Utah" => "urn:publicid:IDN+utah.cloudlab.us+authority+cm"); "Utah" => "urn:publicid:IDN+utah.cloudlab.us+authority+cm",
"OneLab" => "urn:publicid:IDN+lab.onelab.eu+authority+cm");
} }
else { else {
$aggregates = array_keys($urn_mapping); $aggregates = array_keys($urn_mapping);
......
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