Commit b5b25b5d authored by Leigh Stoller's avatar Leigh Stoller

Remove the SSLCERT defs and the network defs from configure proper.

Move them to defs-default.

Allow for per-user defs files to use . defs-default in them. I do this
by temporarly changing the path when evaluating the defs file, adding
the directory where the defs file lives. So, you can do this in your
personal defs file, whic saves on a lot of typing!

	. defs-default
	TBOPSEMAIL=stoller@flux.utah.edu
	TBLOGSEMAIL=stoller@flux.utah.edu
	blah
	blah
	blah

I also changed all of the *local* defs file to use the above format.
parent a8d83fd9
......@@ -1579,7 +1579,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
apache/GNUmakefile apache/httpd.conf \
xmlrpc/GNUmakefile xmlrpc/emulabclient.py xmlrpc/emulabserver.py \
xmlrpc/sshxmlrpc_client.py xmlrpc/sshxmlrpc_server.py \
xmlrpc/webxmlrpc xmlrpc/script_wrapper.py \
xmlrpc/webxmlrpc xmlrpc/script_wrapper.py xmlrpc/libxmlrpc.pm \
xmlrpc/emulab xmlrpc/node xmlrpc/experiment xmlrpc/fs xmlrpc/user \
xmlrpc/imageid xmlrpc/osid xmlrpc/server xmlrpc/xmlrpcbag \
cdrom/GNUmakefile cdrom/tbbootconfig/GNUmakefile \
......
......@@ -135,34 +135,6 @@ TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns"
BOSSEVENTPORT=2927
UNIFIED_BOSS_AND_OPS=0
#
# SSL Certificate stuff. Used to customize config files in ssl directory.
# Note that OrganizationalUnit is set in the cnf file.
# CommonName is typically set to BOSSNODE and emailAddress to TBOPSEMAIL
#
SSLCERT_COUNTRY="US"
SSLCERT_STATE="Utah"
SSLCERT_LOCALITY="Salt Lake City"
SSLCERT_ORGNAME="Utah Network Testbed"
#
# Network config stuff. Obviously, this needs to be localized, but there are
# too many defs files too worry about right now.
#
TESTBED_NETWORK=155.98.32.0
TESTBED_NETMASK=255.255.240.0
BOSSNODE_IP=155.98.32.70
USERNODE_IP=155.98.33.74
CONTROL_ROUTER_IP=155.98.36.1
CONTROL_NETWORK=155.98.36.0
CONTROL_NETMASK=255.255.252.0
PRIVATE_NETWORK=155.98.32.0
PRIVATE_ROUTER=155.98.32.1
PRIVATE_NETMASK=255.255.255.0
PUBLIC_NETWORK=155.98.33.0
PUBLIC_ROUTER=155.98.33.1
PUBLIC_NETMASK=255.255.255.0
DHCPD_DYNRANGE="155.98.36.200 155.98.36.249"
DHCPD_CONTROLNET_DECL=""
#
# Okay, I know this is improper usage of --with. Too bad.
......@@ -174,15 +146,20 @@ AC_ARG_WITH(TBDEFS,
AC_MSG_ERROR(Invalid TBDEFS - Must specify the value)
fi
TBDEFS="$withval"
TBPATH=`dirname $withval`
],[
TBDEFS="$srcdir/defs-default"
TBPATH="$srcdir"
])
if test -f $TBDEFS; then
#
# Remove the comments and newlines. Really, that's what it does.
#
OLDPATH=$PATH
PATH="$TBPATH:$PATH"
eval `cat $TBDEFS | sed -n -e '{s/#.*$//;H;}; ${g;s/\n/ /g;s/ */ /g;p;}'`
PATH=$OLDPATH
else
AC_MSG_ERROR([Definitions file $TBDEFS was not found.])
fi
......
......@@ -4,23 +4,12 @@
# Use the --with-TBDEFS=filename to specify your own. If you add a variable,
# be sure to go and update configure.in.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=calfeld@flux.utah.edu
TBLOGSEMAIL=calfeld@flux.utah.edu
TBWWWEMAIL=calfeld@flux.utah.edu
TBAPPROVALEMAIL=calfeld@flux.utah.edu
TBAUDITEMAIL=calfeld@flux.utah.edu
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=calfeld@flux.utah.edu
TBTESTSUITEEMAIL=calfeld@flux.utah.edu
WWWHOST=www.emulab.net
THISHOMEBASE=Emulab.Net
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
#
# This is the definitions file for Dave on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=davidand@cs.utah.edu
TBLOGSEMAIL=davidand@cs.utah.edu
TBWWWEMAIL=davidand@cs.utah.edu
TBAUDITEMAIL=davidand@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
DELAYCAPACITY=2
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=davidand@cs.utah.edu
TBTESTSUITEEMAIL=davidand@cs.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/~davidand/www
FS_WITH_QUOTAS="/q /groups /users"
\ No newline at end of file
#
# This is the definitions file for Kirk on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=duerig@flux.utah.edu
TBLOGSEMAIL=duerig@flux.utah.edu
TBWWWEMAIL=duerig@flux.utah.edu
TBAUDITEMAIL=duerig@flux.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
DELAYCAPACITY=2
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=duerig@flux.utah.edu
TBTESTSUITEEMAIL=duerig@flux.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/~duerig/www
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
#
# This is the definitions file for Russ on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=fish@flux.utah.edu
TBLOGSEMAIL=fish@flux.utah.edu
TBWWWEMAIL=fish@flux.utah.edu
TBAPPROVALEMAIL=fish@flux.utah.edu
TBAUDITEMAIL=fish@flux.utah.edu
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
FSDIR_SHARE=/share
TBSTATEDEMAIL=fish@flux.utah.edu
TBTESTSUITEEMAIL=fish@flux.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/fish
THISHOMEBASE=Fish.Emulab.Net
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-10.tar.bz2"
#
# This is the definitions file for Kirk on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=kwebb@flux.utah.edu
TBLOGSEMAIL=kwebb@flux.utah.edu
TBWWWEMAIL=kwebb@flux.utah.edu
TBAUDITEMAIL=kwebb@flux.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
DELAYCAPACITY=2
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=kwebb@flux.utah.edu
TBTESTSUITEEMAIL=kwebb@flux.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/kwebb
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-kwebb.tar.bz2"
#
# This is the definitions file for Mac on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
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
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=newbold@flux.utah.edu
TBTESTSUITEEMAIL=newbold@flux.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/mac
THISHOMEBASE=Mac.Emulab.Net
TBAUTHTIMEOUT=216000
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-10.tar.bz2"
#
# This is the definitions file for Mac when he uses his own db.
#
. defs-default
TBDBNAME=macdb
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
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
TBSTATEDEMAIL=newbold@flux.utah.edu
TBTESTSUITEEMAIL=newbold@flux.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/mac
THISHOMEBASE=Mac.Emulab.Net
FS_WITH_QUOTAS="/q /users"
#
# This is the definitions file for Rob on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
TBOPSEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu
......@@ -11,18 +11,4 @@ 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
OURDOMAIN=emulab.net
DELAYCAPACITY=2
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/ricci
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-10.tar.bz2"
#
# This is the definitions file for Shashi on Emulab.Net.
#
TBDBNAME=tbdb
TBOPSEMAIL=shash@cs.utah.edu
. defs-default
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
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
DELAYCAPACITY=2
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
TBSTATEDEMAIL=shash+stated@cs.utah.edu
TBTESTSUITEEMAIL=shash+testsuite@cs.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/shash
THISHOMEBASE=Shash.Emulab.Net
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-kwebb.tar.bz2"
#
# This is the definitions file for Leigh on Emulab.Net.
#
TBDBNAME=tbdb
. defs-default
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
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
FSNODE=fs.emulab.net
OURDOMAIN=emulab.net
FSDIR_GROUPS=/groups
FSDIR_PROJ=/q/proj
FSDIR_USERS=/users
FSDIR_SHARE=/share
TBSTATEDEMAIL=stoller@fast.cs.utah.edu
TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu
WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/stoller
THISHOMEBASE=Stoller.Emulab.Net
FS_WITH_QUOTAS="/q /groups /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-10.tar.bz2"
......@@ -25,3 +25,30 @@ TBBASE=http://golden-gw.ballmoss.com:9876/~stoller/testbed
TBSECURECOOKIES=0
TBAUTHTIMEOUT=216000
THISHOMEBASE=Stoller.Emulab.Net
#
# SSL Certificate stuff. Used to customize config files in ssl directory.
# Note that OrganizationalUnit is set in the cnf file.
# CommonName is typically set to BOSSNODE and emailAddress to TBOPSEMAIL
#
SSLCERT_COUNTRY="US"
SSLCERT_STATE="Utah"
SSLCERT_LOCALITY="Salt Lake City"
SSLCERT_ORGNAME="Utah Network Testbed"
#
# Network config stuff. Used to generate initial named and dhcpd config files.
#
TESTBED_NETWORK=155.98.32.0
TESTBED_NETMASK=255.255.240.0
BOSSNODE_IP=155.98.32.70
USERNODE_IP=155.98.33.74
CONTROL_ROUTER_IP=155.98.36.1
CONTROL_NETWORK=155.98.36.0
CONTROL_NETMASK=255.255.252.0
PRIVATE_NETWORK=155.98.32.0
PRIVATE_ROUTER=155.98.32.1
PRIVATE_NETMASK=255.255.255.0
PUBLIC_NETWORK=155.98.33.0
PUBLIC_ROUTER=155.98.33.1
PUBLIC_NETMASK=255.255.255.0
DHCPD_DYNRANGE="155.98.36.200 155.98.36.249"
#
# This is the definitions file for Leigh on Emulab.Net.
#
. defs-default
TBDBNAME=lbsdb
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
TBSTATEDEMAIL=stoller@fast.cs.utah.edu
TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu
WWW=www.emulab.net/~stoller/www
THISHOMEBASE=Stoller.Emulab.Net
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