Skip to content

GitLab

emulab-devel
emulab-devel
Commit d0e93ddb authored by Robert Ricci's avatar Robert Ricci
Browse files
Options

Move email configuration out of the www defs files - defs.php3.in now 

picks it up from the main defs file via configure.

Fixed up everybody's defs and www defs files to match the new way of
doing things.
parent 426b5f64
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 201 deletions
configure
View file @ d0e93ddb
......@@ -850,6 +850,22 @@ fi
#
# Offer both versions of the email addresses that have the @ escaped
# for perl (the default), and that don't
#
......@@ -950,20 +966,32 @@ EOF
fi
#
# The email addresses need to be be munged for perl scripts.
# The email addresses need to be be munged for perl scripts. But,
# php needs them un-escaped
#
TBOPSEMAIL_NOSLASH="$TBOPSEMAIL"
TBOPSEMAIL="`echo $TBOPSEMAIL | sed -e 's/@/\\\@/'`"
TBLOGSEMAIL_NOSLASH="$TBLOGSEMAIL"
TBLOGSEMAIL="`echo $TBLOGSEMAIL | sed -e 's/@/\\\@/'`"
TBAUDITEMAIL_NOSLASH="$TBAUDITEMAIL"
TBAUDITEMAIL="`echo $TBAUDITEMAIL | sed -e 's/@/\\\@/'`"
TBWWWEMAIL_NOSLASH="$TBWWWEMAIL"
TBWWWEMAIL="`echo $TBWWWEMAIL | sed -e 's/@/\\\@/'`"
TBAPPROVALEMAIL_NOSLASH="$TBAPPROVALEMAIL"
TBAPPROVALEMAIL="`echo $TBAPPROVALEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE"
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
else
TBACTIVEARCHIVE_NOSLASH="$TBOPSEMAIL_NOSLASH"
TBACTIVEARCHIVE="$TBOPSEMAIL"
fi
if test -n "$TBUSERSARCHIVE"; then
TBUSERSARCHIVE_NOSLASH="$TBUSERSARCHIVE"
TBUSERSARCHIVE="`echo $TBUSERSARCHIVE | sed -e 's/@/\\\@/'`"
else
TBUSERSARCHIVE_NOSLASH="$TBOPSEMAIL_NOSLASH"
TBUSERSARCHIVE="$TBOPSEMAIL"
fi
......@@ -1202,7 +1230,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1206: checking for a BSD compatible install" >&5
echo "configure:1234: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -1490,13 +1518,6 @@ s%@optional_subdirs@%$optional_subdirs%g
s%@TBDBNAME@%$TBDBNAME%g
s%@WWWDEFS@%$WWWDEFS%g
s%@TBADMINGROUP@%$TBADMINGROUP%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
s%@TBAUDITEMAIL@%$TBAUDITEMAIL%g
s%@TBSTATEDEMAIL@%$TBSTATEDEMAIL%g
s%@TBTESTSUITEEMAIL@%$TBTESTSUITEEMAIL%g
s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g
s%@TBUSERSARCHIVE@%$TBUSERSARCHIVE%g
s%@DELAYCAPACITY@%$DELAYCAPACITY%g
s%@IPBASE@%$IPBASE%g
s%@BOSSNODE@%$BOSSNODE%g
......@@ -1516,6 +1537,24 @@ s%@CLIENT_ETCDIR@%$CLIENT_ETCDIR%g
s%@CLIENT_BINDIR@%$CLIENT_BINDIR%g
s%@CLIENT_VARDIR@%$CLIENT_VARDIR%g
s%@SNMP_RW_COMMUNITY@%$SNMP_RW_COMMUNITY%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
s%@TBLOGSEMAIL_NOSLASH@%$TBLOGSEMAIL_NOSLASH%g
s%@TBWWWEMAIL@%$TBWWWEMAIL%g
s%@TBWWWEMAIL_NOSLASH@%$TBWWWEMAIL_NOSLASH%g
s%@TBAPPROVALEMAIL@%$TBAPPROVALEMAIL%g
s%@TBAPPROVALEMAIL_NOSLASH@%$TBAPPROVALEMAIL_NOSLASH%g
s%@TBAUDITEMAIL@%$TBAUDITEMAIL%g
s%@TBAUDITEMAIL_NOSLASH@%$TBAUDITEMAIL_NOSLASH%g
s%@TBSTATEDEMAIL@%$TBSTATEDEMAIL%g
s%@TBSTATEDEMAIL_NOSLASH@%$TBSTATEDEMAIL_NOSLASH%g
s%@TBTESTSUITEEMAIL@%$TBTESTSUITEEMAIL%g
s%@TBTESTSUITEEMAIL_NOSLASH@%$TBTESTSUITEEMAIL_NOSLASH%g
s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g
s%@TBACTIVEARCHIVE_NOSLASH@%$TBACTIVEARCHIVE_NOSLASH%g
s%@TBUSERSARCHIVE@%$TBUSERSARCHIVE%g
s%@TBUSERSARCHIVE_NOSLASH@%$TBUSERSARCHIVE_NOSLASH%g
s%@LEDA@%$LEDA%g
s%@ASSIGN@%$ASSIGN%g
s%@SSH_ARGS@%$SSH_ARGS%g
......
configure.in
View file @ d0e93ddb
......@@ -23,13 +23,6 @@ AC_SUBST(optional_subdirs)
AC_SUBST(TBDBNAME)
AC_SUBST(WWWDEFS)
AC_SUBST(TBADMINGROUP)
AC_SUBST(TBOPSEMAIL)
AC_SUBST(TBLOGSEMAIL)
AC_SUBST(TBAUDITEMAIL)
AC_SUBST(TBSTATEDEMAIL)
AC_SUBST(TBTESTSUITEEMAIL)
AC_SUBST(TBACTIVEARCHIVE)
AC_SUBST(TBUSERSARCHIVE)
AC_SUBST(DELAYCAPACITY)
AC_SUBST(IPBASE)
AC_SUBST(BOSSNODE)
......@@ -50,6 +43,29 @@ AC_SUBST(CLIENT_BINDIR)
AC_SUBST(CLIENT_VARDIR)
AC_SUBST(SNMP_RW_COMMUNITY)
#
# Offer both versions of the email addresses that have the @ escaped
# for perl (the default), and that don't
#
AC_SUBST(TBOPSEMAIL)
AC_SUBST(TBOPSEMAIL_NOSLASH)
AC_SUBST(TBLOGSEMAIL)
AC_SUBST(TBLOGSEMAIL_NOSLASH)
AC_SUBST(TBWWWEMAIL)
AC_SUBST(TBWWWEMAIL_NOSLASH)
AC_SUBST(TBAPPROVALEMAIL)
AC_SUBST(TBAPPROVALEMAIL_NOSLASH)
AC_SUBST(TBAUDITEMAIL)
AC_SUBST(TBAUDITEMAIL_NOSLASH)
AC_SUBST(TBSTATEDEMAIL)
AC_SUBST(TBSTATEDEMAIL_NOSLASH)
AC_SUBST(TBTESTSUITEEMAIL)
AC_SUBST(TBTESTSUITEEMAIL_NOSLASH)
AC_SUBST(TBACTIVEARCHIVE)
AC_SUBST(TBACTIVEARCHIVE_NOSLASH)
AC_SUBST(TBUSERSARCHIVE)
AC_SUBST(TBUSERSARCHIVE_NOSLASH)
#
# Defaults for for above variables.
#
......@@ -102,20 +118,32 @@ if test -n "$FSDIR_SHARE"; then
fi
#
# The email addresses need to be be munged for perl scripts.
# The email addresses need to be be munged for perl scripts. But,
# php needs them un-escaped
#
TBOPSEMAIL_NOSLASH="$TBOPSEMAIL"
TBOPSEMAIL="`echo $TBOPSEMAIL | sed -e 's/@/\\\@/'`"
TBLOGSEMAIL_NOSLASH="$TBLOGSEMAIL"
TBLOGSEMAIL="`echo $TBLOGSEMAIL | sed -e 's/@/\\\@/'`"
TBAUDITEMAIL_NOSLASH="$TBAUDITEMAIL"
TBAUDITEMAIL="`echo $TBAUDITEMAIL | sed -e 's/@/\\\@/'`"
TBWWWEMAIL_NOSLASH="$TBWWWEMAIL"
TBWWWEMAIL="`echo $TBWWWEMAIL | sed -e 's/@/\\\@/'`"
TBAPPROVALEMAIL_NOSLASH="$TBAPPROVALEMAIL"
TBAPPROVALEMAIL="`echo $TBAPPROVALEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE"
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
else
TBACTIVEARCHIVE_NOSLASH="$TBOPSEMAIL_NOSLASH"
TBACTIVEARCHIVE="$TBOPSEMAIL"
fi
if test -n "$TBUSERSARCHIVE"; then
TBUSERSARCHIVE_NOSLASH="$TBUSERSARCHIVE"
TBUSERSARCHIVE="`echo $TBUSERSARCHIVE | sed -e 's/@/\\\@/'`"
else
TBUSERSARCHIVE_NOSLASH="$TBOPSEMAIL_NOSLASH"
TBUSERSARCHIVE="$TBOPSEMAIL"
fi
......
defs-barb-emulab
View file @ d0e93ddb
......@@ -5,6 +5,8 @@ TBDBNAME=tbdb
WWWDEFS=barb-emulab
TBOPSEMAIL=barb@cs.utah.edu
TBLOGSEMAIL=barb@cs.utah.edu
TBWWWEMAIL=barb@cs.utah.edu
TBAPPROVALEMAIL=barb@cs.utah.edu
TBAUDITEMAIL=barb@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
......
defs-barb-mini
View file @ d0e93ddb
......@@ -6,6 +6,8 @@ WWWDEFS=barb-mini
TBADMINGROUP=flux
TBOPSEMAIL=barb@cs.utah.edu
TBLOGSEMAIL=barb@cs.utah.edu
TBWWWEMAIL=barb@cs.utah.edu
TBAPPROVALEMAIL=barb@cs.utah.edu
TBAUDITEMAIL=barb@cs.utah.edu
TBACTIVEARCHIVE=barb@cs.utah.edu
TBUSERSARCHIVE=barb@cs.utah.edu
......
defs-calfeld-emulab
View file @ d0e93ddb
......@@ -8,6 +8,8 @@ TBDBNAME=tbdb
WWWDEFS=default
TBOPSEMAIL=calfeld@flux.cs.utah.edu
TBLOGSEMAIL=calfeld@flux.cs.utah.edu
TBWWWEMAIL=calfeld@flux.cs.utah.edu
TBAPPROVALEMAIL=calfeld@flux.cs.utah.edu
TBAUDITEMAIL=calfeld@flux.cs.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
......
defs-default
View file @ d0e93ddb
......@@ -8,8 +8,10 @@
TBDBNAME=tbdb
WWWDEFS=default
TBADMINGROUP=flux
TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>'
TBOPSEMAIL=testbed-ops@flux.cs.utah.edu
TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu
TBWWWEMAIL=testbed-www@flux.cs.utah.edu
TBAPPROVALEMAIL=testbed-approval@flux.cs.utah.edu
TBAUDITEMAIL=testbed-audit@flux.cs.utah.edu
TBSTATEDEMAIL=testbed-stated@flux.utah.edu
TBTESTSUITEEMAIL=testbed-testsuite@flux.utah.edu
......
defs-kwebb-emulab
View file @ d0e93ddb
......@@ -5,6 +5,7 @@ TBDBNAME=tbdb
WWWDEFS=kwebb-emulab
TBOPSEMAIL=kwebb@cs.utah.edu
TBLOGSEMAIL=kwebb@cs.utah.edu
TBWWWEMAIL=kwebb@cs.utah.edu
TBAUDITEMAIL=kwebb@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
......
defs-mini
View file @ d0e93ddb
......@@ -9,6 +9,8 @@ WWWDEFS=mini
TBADMINGROUP=flux
TBOPSEMAIL=minitestbed-ops@flux.cs.utah.edu
TBLOGSEMAIL=minitestbed-logs@flux.cs.utah.edu
TBWWWEMAIL=minitestbed-www@flux.cs.utah.edu
TBAPPROVALEMAIL=minitestbed-approval@flux.cs.utah.edu
TBAUDITEMAIL=minitestbed-audit@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
......
defs-newbold-emulab
View file @ d0e93ddb
......@@ -5,6 +5,8 @@ TBDBNAME=tbdb
WWWDEFS=newbold-emulab
TBOPSEMAIL=newbold@flux.utah.edu
TBLOGSEMAIL=newbold@flux.utah.edu
TBWWWEMAIL=newbold+www@cs.utah.edu
TBAPPROVALEMAIL=newbold+approve@cs.utah.edu
TBAUDITEMAIL=newbold@flux.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
......
defs-newbold-macdb
View file @ d0e93ddb
......@@ -5,6 +5,8 @@ TBDBNAME=macdb
WWWDEFS=newbold-emulab
TBOPSEMAIL=newbold@flux.utah.edu
TBLOGSEMAIL=newbold@flux.utah.edu
TBWWWEMAIL=newbold+www@cs.utah.edu
TBAPPROVALEMAIL=newbold+approve@cs.utah.edu
TBAUDITEMAIL=newbold@flux.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
......
defs-newbold-mini
View file @ d0e93ddb
......@@ -10,6 +10,8 @@ WWWDEFS=newbold-mini
TBADMINGROUP=flux
TBOPSEMAIL=newbold+mini-ops@flux.utah.edu
TBLOGSEMAIL=newbold+mini-log@flux.utah.edu
TBWWWEMAIL=newbold+mini-www@cs.utah.edu
TBAPPROVALEMAIL=newbold+mini-approve@cs.utah.edu
TBAUDITEMAIL=newbold+mini-log@flux.utah.edu
TBACTIVEARCHIVE=newbold+activearch@flux.utah.edu
TBUSERSARCHIVE=newbold+usersarch@flux.utah.edu
......
defs-rchriste-emulab
View file @ d0e93ddb
......@@ -5,6 +5,8 @@ TBDBNAME=tbdb
WWWDEFS=rchriste-emulab
TBOPSEMAIL=rchriste@cs.utah.edu
TBLOGSEMAIL=rchriste@cs.utah.edu
TBWWWEMAIL=rchriste@cs.utah.edu
TBAPPROVALEMAIL=rchriste@cs.utah.edu
TBAUDITEMAIL=rchriste@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
......
defs-ricci-emulab
View file @ d0e93ddb
#
# This is the definitions file for Mac on Emulab.Net.
# This is the definitions file for Rob on Emulab.Net.
#
TBDBNAME=tbdb
WWWDEFS=ricci-emulab
TBOPSEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu
TBWWWEMAIL=ricci@cs.utah.edu
TBAPPROVALEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu
TBAUDITEMAIL=ricci@cs.utah.edu
TBSTATEDEMAIL=ricci@cs.utah.edu
TBTESTSUITEEMAIL=ricci@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
......@@ -15,5 +22,4 @@ IPBASE=192.168
FSDIR_GROUPS=/q/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=ricci@cs.utah.edu
TBTESTSUITEEMAIL=ricci@cs.utah.edu
defs-ricci-mini
View file @ d0e93ddb
......@@ -9,6 +9,8 @@ WWWDEFS=ricci-mini
TBADMINGROUP=flux
TBOPSEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu
TBWWWEMAIL=ricci@cs.utah.edu
TBAPPROVALEMAIL=ricci@cs.utah.edu
TBAUDITEMAIL=ricci@cs.utah.edu
TBACTIVEARCHIVE=ricci@cs.utah.edu
TBUSERSARCHIVE=ricci@cs.utah.edu
......
defs-shash-emulab
View file @ d0e93ddb
......@@ -6,6 +6,8 @@ WWWDEFS=shash-emulab
TBOPSEMAIL=shash@cs.utah.edu
TBOPSEMAIL=shash+emulab-ops@cs.utah.edu
TBLOGSEMAIL=shash+emulab-log@cs.utah.edu
TBWWWEMAIL=shash+emulab-www@cs.utah.edu
TBAPPROVALEMAIL=shash+emulab-approve@cs.utah.edu
TBACTIVEARCHIVE=shash+activearch@cs.utah.edu
TBUSERSARCHIVE=shash+usersarch@cs.utah.edu
BOSSNODE=boss.emulab.net
......
defs-shash-mini
View file @ d0e93ddb
......@@ -10,6 +10,8 @@ WWWDEFS=shash-mini
TBADMINGROUP=flux
TBOPSEMAIL=shash+mini-ops@cs.utah.edu
TBLOGSEMAIL=shash+mini-log@cs.utah.edu
TBWWWEMAIL=shash+mini-www@cs.utah.edu
TBAPPROVALEMAIL=shash+mini-approve@cs.utah.edu
TBAUDITEMAIL=shash+mini-log@cs.utah.edu
TBACTIVEARCHIVE=shash+activearch@cs.utah.edu
TBUSERSARCHIVE=shash+usersarch@cs.utah.edu
......
defs-stoller-emulab
View file @ d0e93ddb
......@@ -3,9 +3,11 @@
#
TBDBNAME=tbdb
WWWDEFS=stoller-emulab
TBOPSEMAIL='Leigh B Stoller <stoller@flux.utah.edu>'
TBLOGSEMAIL='Leigh B Stoller <stoller@flux.utah.edu>'
TBAUDITEMAIL='Leigh B Stoller <stoller@flux.utah.edu>'
TBOPSEMAIL=stoller@flux.utah.edu
TBLOGSEMAIL=stoller@flux.utah.edu
TBWWWEMAIL=stoller@flux.utah.edu
TBAPPROVALEMAIL=stoller@flux.utah.edu
TBAUDITEMAIL=stoller@flux.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
......@@ -15,5 +17,5 @@ OURDOMAIN=emulab.net
FSDIR_GROUPS=/q/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBTESTSUITEEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBSTATEDEMAIL=stoller@fast.cs.utah.edu
TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu
defs-stoller-home
View file @ d0e93ddb
......@@ -3,9 +3,11 @@
#
TBDBNAME=tbdb
WWWDEFS=stoller-home
TBOPSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBLOGSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBAUDITEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBOPSEMAIL=stoller@stoller.casco.net
TBLOGSEMAIL=stoller@stoller.casco.net
TBWWWEMAIL=stoller@stoller.casco.net
TBAPPROVALEMAIL=stoller@stoller.casco.net
TBAUDITEMAIL=stoller@stoller.casco.net
IPBASE=192.168
DELAYCAPACITY=2
BOSSNODE=golden-gw.ballmoss.com
......@@ -15,5 +17,5 @@ OURDOMAIN=ballmoss.com
FSDIR_GROUPS=/groups
FSDIR_PROJ=/proj
FSDIR_USERS=/users
TBSTATEDEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBTESTSUITEEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBSTATEDEMAIL=stoller@stoller.casco.net
TBTESTSUITEEMAIL=stoller@stoller.casco.net
defs-stoller-mini
View file @ d0e93ddb
......@@ -8,9 +8,11 @@ TBDBNAME=tbdb
WWWDEFS=mini
WWWDEFS=stoller-mini
TBADMINGROUP=flux
TBOPSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBLOGSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBAUDITEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBOPSEMAIL=stoller@fast.cs.utah.edu
TBLOGSEMAIL=stoller@fast.cs.utah.edu
TBWWWEMAIL=stoller@fast.cs.utah.edu
TBAPPROVALEMAIL=stoller@fast.cs.utah.edu
TBAUDITEMAIL=stoller@fast.cs.utah.edu
IPBASE=192.168
DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net
......@@ -20,5 +22,5 @@ OURDOMAIN=mini.emulab.net
FSDIR_GROUPS=/z/groups
FSDIR_PROJ=/z/proj
FSDIR_USERS=/z/users
TBSTATEDEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBTESTSUITEEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBSTATEDEMAIL=stoller@fast.cs.utah.edu
TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu
defs-wide
View file @ d0e93ddb
......@@ -10,6 +10,8 @@ WWWDEFS=wide
TBADMINGROUP=tbadmin
TBOPSEMAIL=widetestbed-ops@flux.cs.utah.edu
TBLOGSEMAIL=widetestbed-logs@flux.cs.utah.edu
TBWWWEMAIL=widetestbed-www@flux.cs.utah.edu
TBAPPROVALEMAIL=widetestbed-approval@flux.cs.utah.edu
TBAUDITEMAIL=widetestbed-audit@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
......
doc/overview.txt
View file @ d0e93ddb
......@@ -175,3 +175,19 @@ If the user swaps the experiment in and out during its lifetime, 'tbswapin' and
When the user terminates the experiment, endexp gets called. It calls tbswapout
to free hardware resources, then calls tbend, which cleans up the experiment's
data in the virt_* tables.
##### The Event System
Our event system is implemented as a thin layer on top of the 'elvin' system.
Elvin is a publish/subscribe system, meaning that programs that want to recive
events connect to the elvin server and subscribe to all events for a particular
node, for a particular traffic generator, etc.
We run an event scheduler for each experiment. It's this sheduler's job to keep
track of future evnets for the experiment, and send them at the appropriate
time. The most basic exampel of this are events specified through the NS file,
but tevc can also be used to schedule events for some future time.
We also
www/barb-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
$TBMAILADDR_OPS = "barb@fast.cs.utah.edu";
$TBMAIL_OPS = "Chad Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "barb@fast.cs.utah.edu";
$TBMAIL_WWW = "Chad Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "barb@fast.cs.utah.edu";
$TBMAIL_APPROVAL = "Chad Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "barb@fast.cs.utah.edu";
$TBMAIL_LOGS = "Chad Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "barb@fast.cs.utah.edu";
$TBMAIL_AUDIT = "Chad Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/barb-mini-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Mini.Emulab.Net";
$THISPROJECT = "The Mini Utah Network Testbed";
$TBMAILADDR_OPS = "barb@fast.cs.utah.edu";
$TBMAIL_OPS = "Chad Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "barb@fast.cs.utah.edu";
$TBMAIL_WWW = "Chad Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "barb@fast.cs.utah.edu";
$TBMAIL_APPROVAL = "Chad Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "barb@fast.cs.utah.edu";
$TBMAIL_LOGS = "Chad Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "barb@fast.cs.utah.edu";
$TBMAIL_AUDIT = "Chad Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/default-defs.php3
View file @ d0e93ddb
......@@ -26,15 +26,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
$TBMAILADDR_OPS = "testbed-ops@flux.cs.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "testbed-www@flux.cs.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "testbed-approval@flux.cs.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "testbed-logs@flux.cs.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "testbed-audit@flux.cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/defs.php3.in
View file @ d0e93ddb
......@@ -8,6 +8,12 @@ $OURDOMAIN = "@OURDOMAIN@";
$BOSSNODE = "@BOSSNODE@";
$TBADMINGROUP = "@TBADMINGROUP@";
$TBMAILADDR_OPS = "@TBOPSEMAIL_NOSLASH@";
$TBMAILADDR_WWW = "@TBWWWEMAIL_NOSLASH@";
$TBMAILADDR_APPROVAL = "@TBAPPROVALEMAIL_NOSLASH@";
$TBMAILADDR_LOGS = "@TBLOGSEMAIL_NOSLASH@";
$TBMAILADDR_AUDIT = "@TBAUDITEMAIL_NOSLASH@";
# Overridden by the defs file!
$TBMAINSITE = 0;
......@@ -42,6 +48,12 @@ $TBAUTHTIMEOUT = 21600;
$HTTPTAG = "http://";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
#
# This just spits out an email address in a page, so it does not need
# to be configured per development tree. It could be though ...
......
www/kwebb-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
$TBMAILADDR_OPS = "kwebb@fast.cs.utah.edu";
$TBMAIL_OPS = "Kwebb Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "kwebb@fast.cs.utah.edu";
$TBMAIL_WWW = "Kwebb Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "kwebb@fast.cs.utah.edu";
$TBMAIL_APPROVAL = "Kwebb Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "kwebb@fast.cs.utah.edu";
$TBMAIL_LOGS = "Kwebb Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "kwebb@fast.cs.utah.edu";
$TBMAIL_AUDIT = "Kwebb Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/mini-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Mini.Emulab.Net";
$THISPROJECT = "The Mini Network Testbed";
$TBMAILADDR_OPS = "minitestbed-ops@flux.cs.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "minitestbed-www@flux.cs.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "minitestbed-approval@flux.cs.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "minitestbed-logs@flux.cs.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "minitestbed-audit@flux.cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/newbold-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#4080FF";
$THISHOMEBASE = "Mac.Emulab.Net";
$THISPROJECT = "The Newbold Network Testbed";
$TBMAILADDR_OPS = "newbold+ops@cs.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "newbold+www@cs.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "newbold+approve@cs.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "newbold+log@cs.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "newbold+audit@cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/newbold-mini-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#4080FF";
$THISHOMEBASE = "Mac.Emulab.Net";
$THISPROJECT = "The Mini Newbold Network Testbed";
$TBMAILADDR_OPS = "newbold+mini-ops@cs.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "newbold+mini-www@cs.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "newbold+mini-approve@cs.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "newbold+mini-log@cs.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "newbold+mini-audit@cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/ricci-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
$TBMAILADDR_OPS = "ricci@fast.cs.utah.edu";
$TBMAIL_OPS = "Ricci Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "ricci@fast.cs.utah.edu";
$TBMAIL_WWW = "Ricci Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "ricci@fast.cs.utah.edu";
$TBMAIL_APPROVAL = "Ricci Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "ricci@fast.cs.utah.edu";
$TBMAIL_LOGS = "Ricci Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "ricci@fast.cs.utah.edu";
$TBMAIL_AUDIT = "Ricci Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/ricci-mini-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Mini.Emulab.Net";
$THISPROJECT = "The Mini Network Testbed";
$TBMAILADDR_OPS = "ricci@cs.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "ricci@cs.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "ricci@cs.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "ricci@cs.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "ricci@cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/shash-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#4080FF";
$THISHOMEBASE = "Shash@Emulab.Net";
$THISPROJECT = "The Shash Network Testbed";
$TBMAILADDR_OPS = "shash+ops@cs.utah.edu";
$TBMAIL_OPS = "Shash Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "shash+www@cs.utah.edu";
$TBMAIL_WWW = "Shash Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "shash+approve@cs.utah.edu";
$TBMAIL_APPROVAL = "Shash Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "shash+log@cs.utah.edu";
$TBMAIL_LOGS = "Shash Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "shash+audit@cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/shash-mini-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#4080FF";
$THISHOMEBASE = "Mini-Shash@Emulab.Net";
$THISPROJECT = "The Mini Shash Network Testbed";
$TBMAILADDR_OPS = "shash+mini-ops@cs.utah.edu";
$TBMAIL_OPS = "Shash Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "shash+mini-www@cs.utah.edu";
$TBMAIL_WWW = "Shash Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "shash+mini-approve@cs.utah.edu";
$TBMAIL_APPROVAL = "Shash Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "shash+mini-log@cs.utah.edu";
$TBMAIL_LOGS = "Shash Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "shash+mini-audit@cs.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/stoller-emulab-defs.php3
View file @ d0e93ddb
......@@ -23,15 +23,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Stoller.Emulab.Net";
$THISPROJECT = "Stoller's Utah Network Testbed";
$TBMAILADDR_OPS = "stoller@flux.utah.edu";
$TBMAIL_OPS = "Testbed Ops <$TBMAILADDR_OPS>";
$TBMAILADDR_WWW = "stoller@flux.utah.edu";
$TBMAIL_WWW = "Testbed WWW <$TBMAILADDR_WWW>";
$TBMAILADDR_APPROVAL = "stoller@flux.utah.edu";
$TBMAIL_APPROVAL = "Testbed Approval <$TBMAILADDR_APPROVAL>";
$TBMAILADDR_LOGS = "stoller@flux.utah.edu";
$TBMAIL_LOGS = "Testbed Logs <$TBMAILADDR_LOGS>";
$TBMAILADDR_AUDIT = "stoller@flux.utah.edu";
$TBMAIL_AUDIT = "Testbed Audit <$TBMAILADDR_AUDIT>";
?>
www/stoller-home-defs.php3
View file @ d0e93ddb
......@@ -24,15 +24,4 @@ $TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Stoller.Emulab.Net";
$THISPROJECT = "My Home Network Testbed";