Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

collab/mailman/mailmanproxy.in

@@ -470,6 +470,7 @@ sub AddList(@)
 	fatal("Could not open $tempfile for writing!");
     print INTRO "From: $TBOPS\n";
     print INTRO "To: " . lc($name) . "\@" . "$OURDOMAIN\n";
+    print INTRO "X-NetBed: mailmanproxy\n";
     print INTRO "Subject: Welcome!\n";
     print INTRO "\n";
     print INTRO "This is the Emulab Mailman archive for $name\n";

protogeni/lib/GeniAuthority.pm.in

@@ -64,6 +64,11 @@ sub Lookup($$)
     elsif ($token =~ /^\w+\-\w+\-\w+\-\w+\-\w+$/) {
 	$uuid = $token;
     }
+    elsif ($token =~ /^P([\w]+)$/) {
+	# Only SAs are looked up this way.
+	# This will be flushed after URNs are fully pushed out.
+	return GeniAuthority->LookupByPrefix($1);
+    }
     elsif ($token =~ /^[\w\.]*$/) {
 	$query_result =
 	    DBQueryWarn("select uuid from geni_authorities ".
@@ -372,6 +377,40 @@ sub ListAll($$)
     return 0;
 }
 
+#
+# Find an authority by looking for the prefix. This will eventually go
+# away when we fully switch to URNs
+#
+# Note tha only SAs are looked up this way.
+#
+sub LookupByPrefix($$)
+{
+    my ($class, $uuid) = @_;
+    my $prefix;
+    
+    if ($uuid =~ /^\w+\-\w+\-\w+\-\w+\-(\w+)$/) {
+	$prefix = $1;
+    }
+    elsif ($uuid =~ /^(\w+)$/) {
+	$prefix = $1;
+    }
+    else {
+	print STDERR "Could not parse uuid for prefix\n";
+	return undef;
+    }
+    
+    my $query_result =
+	DBQueryWarn("select uuid from geni_authorities ".
+		    "where uuid_prefix='$prefix' and type='sa'");
+
+    return undef
+	if (! $query_result || !$query_result->numrows);
+
+    ($uuid) = $query_result->fetchrow_array();
+
+    return GeniAuthority->Lookup($uuid);
+}
+
 # _Always_ make sure that this 1 is at the end of the file...
 1;
 

protogeni/scripts/initsite.in

@@ -248,8 +248,7 @@ if (! -e "$TB/www/protogeni") {
 $crosstext = <<'CROSSEND';
 <?xml version="1.0"?>
 <cross-domain-policy>
-    <allow-access-from domain="boss.emulab.net" />
-    <allow-access-from domain="users.emulab.net" />
+    <allow-access-from domain="*.emulab.net" />
     <allow-access-from domain="*.protogeni.net" />
 </cross-domain-policy>
 CROSSEND

tbsetup/nfstrace.in

@@ -2,7 +2,7 @@
 
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
+# Copyright (c) 2005, 2006, 2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -199,7 +199,10 @@ if ($cmd eq "gc" && defined($pid)) {
 		     "       and pid='$pid' and eid='$eid'");
     
     while (my ($vname,$ip) = $nodes_result->fetchrow_array) {
-	print NT_WRITER "$vname:$ip\n";
+	# not all devices have an IP address on the control net
+	if ($ip) {
+	    print NT_WRITER "$vname:$ip\n";
+	}
     }
 }
 

utils/create_image.in

 #!/usr/bin/perl -wT
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2008 University of Utah and the Flux Group.
+# Copyright (c) 2000-2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use English;
@@ -20,13 +20,16 @@ use File::Basename;
 # $checkwait	time between progress checks (must be int div of $idlewait)
 # $reportwait	time between progress reports (must be multiple of $checkwait)
 #
-# $maximagesize	max size in bytes of an image
+# $maximagesize	max size in bytes of an image.  This should really be in the
+#		DB (per-testbed, per-project, per-user, per-something), and
+#		not hardwired here.  In the meantime, we set this big and let
+#		disk quotas do the dirty work of limiting size.
 #
 my $maxwait      = (72 * 60);
 my $idlewait     = ( 8 * 60);
 my $reportwait   = ( 2 * 60);
 my $checkwait    = 15;
-my $maximagesize = (6 * 1024**3); # 6GB
+my $maximagesize = (20 * 1024**3); # 20GB
 
 #
 # Create a disk image.