Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
7b9b115a
Commit
7b9b115a
authored
May 12, 2010
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
parents
f6547f54
964a0393
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
7 deletions
+52
-7
collab/mailman/mailmanproxy.in
collab/mailman/mailmanproxy.in
+1
-0
protogeni/lib/GeniAuthority.pm.in
protogeni/lib/GeniAuthority.pm.in
+39
-0
protogeni/scripts/initsite.in
protogeni/scripts/initsite.in
+1
-2
tbsetup/nfstrace.in
tbsetup/nfstrace.in
+5
-2
utils/create_image.in
utils/create_image.in
+6
-3
No files found.
collab/mailman/mailmanproxy.in
View file @
7b9b115a
...
...
@@ -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
View file @
7b9b115a
...
...
@@ -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
View file @
7b9b115a
...
...
@@ -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
View file @
7b9b115a
...
...
@@ -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
View file @
7b9b115a
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
8
University of Utah and the Flux Group.
# Copyright (c) 2000-20
1
0 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
);
#
6
GB
my
$maximagesize
=
(
20
*
1024
**
3
);
#
20
GB
#
# Create a disk image.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment