All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 64e557f3 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Add configure variables to defs files. Don't like hardwiring these

things, although this solution is not hugely better ...

	BOSSNODE=boss.emulab.net
	USERNODE=users.emulab.net
	OURDOMAIN=emulab.net
parent e06f4639
...@@ -17,6 +17,9 @@ TBROOT = @prefix@ ...@@ -17,6 +17,9 @@ TBROOT = @prefix@
TBDBNAME = @TBDBNAME@ TBDBNAME = @TBDBNAME@
TBOPSEMAIL = @TBOPSEMAIL@ TBOPSEMAIL = @TBOPSEMAIL@
TBLOGSEMAIL = @TBLOGSEMAIL@ TBLOGSEMAIL = @TBLOGSEMAIL@
BOSSNODE = @BOSSNODE@
USERNODE = @USERNODE@
OURDOMAIN = @OURDOMAIN@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CFLAGS += @CFLAGS@ CFLAGS += @CFLAGS@
CXXFLAGS += @CXXFLAGS@ CXXFLAGS += @CXXFLAGS@
......
...@@ -811,6 +811,9 @@ fi ...@@ -811,6 +811,9 @@ fi
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
# #
...@@ -956,7 +959,7 @@ fi ...@@ -956,7 +959,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:960: checking for a BSD compatible install" >&5 echo "configure:963: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1226,6 +1229,9 @@ s%@TBOPSEMAIL@%$TBOPSEMAIL%g ...@@ -1226,6 +1229,9 @@ s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
s%@DELAYCAPACITY@%$DELAYCAPACITY%g s%@DELAYCAPACITY@%$DELAYCAPACITY%g
s%@IPBASE@%$IPBASE%g s%@IPBASE@%$IPBASE%g
s%@BOSSNODE@%$BOSSNODE%g
s%@USERNODE@%$USERNODE%g
s%@OURDOMAIN@%$OURDOMAIN%g
s%@LEDA@%$LEDA%g s%@LEDA@%$LEDA%g
s%@SSH_ARGS@%$SSH_ARGS%g s%@SSH_ARGS@%$SSH_ARGS%g
s%@INSTALL_RCDIR@%$INSTALL_RCDIR%g s%@INSTALL_RCDIR@%$INSTALL_RCDIR%g
......
...@@ -21,6 +21,9 @@ AC_SUBST(TBOPSEMAIL) ...@@ -21,6 +21,9 @@ AC_SUBST(TBOPSEMAIL)
AC_SUBST(TBLOGSEMAIL) AC_SUBST(TBLOGSEMAIL)
AC_SUBST(DELAYCAPACITY) AC_SUBST(DELAYCAPACITY)
AC_SUBST(IPBASE) AC_SUBST(IPBASE)
AC_SUBST(BOSSNODE)
AC_SUBST(USERNODE)
AC_SUBST(OURDOMAIN)
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
......
...@@ -10,4 +10,6 @@ TBOPSEMAIL=calfeld@flux.cs.utah.edu ...@@ -10,4 +10,6 @@ TBOPSEMAIL=calfeld@flux.cs.utah.edu
TBLOGSEMAIL=calfeld@flux.cs.utah.edu TBLOGSEMAIL=calfeld@flux.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
DELAYCAPACITY=2 DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -9,4 +9,7 @@ WWWDEFS=default ...@@ -9,4 +9,7 @@ WWWDEFS=default
TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>' TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>'
TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
DELAYCAPACITY=2 DELAYCAPACITY=2
\ No newline at end of file BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -5,3 +5,6 @@ TBDBNAME=tbdb ...@@ -5,3 +5,6 @@ TBDBNAME=tbdb
WWWDEFS=neo-paper WWWDEFS=neo-paper
TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>' TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>'
TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -7,5 +7,6 @@ TBOPSEMAIL=newbold@cs.utah.edu ...@@ -7,5 +7,6 @@ TBOPSEMAIL=newbold@cs.utah.edu
TBLOGSEMAIL=newbold@cs.utah.edu TBLOGSEMAIL=newbold@cs.utah.edu
IPBASE=192.168 IPBASE=192.168
DELAYCAPACITY=2 DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -5,5 +5,6 @@ TBDBNAME=tbdb ...@@ -5,5 +5,6 @@ TBDBNAME=tbdb
WWWDEFS=ricci-emulab WWWDEFS=ricci-emulab
TBOPSEMAIL=ricci@cs.utah.edu TBOPSEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu TBLOGSEMAIL=ricci@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -5,4 +5,6 @@ TBDBNAME=tbdb ...@@ -5,4 +5,6 @@ TBDBNAME=tbdb
WWWDEFS=ricci-neo-paper WWWDEFS=ricci-neo-paper
TBOPSEMAIL=ricci@cs.utah.edu TBOPSEMAIL=ricci@cs.utah.edu
TBLOGSEMAIL=ricci@cs.utah.edu TBLOGSEMAIL=ricci@cs.utah.edu
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -7,5 +7,6 @@ TBOPSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>' ...@@ -7,5 +7,6 @@ TBOPSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
TBLOGSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>' TBLOGSEMAIL='Leigh B Stoller <stoller@fast.cs.utah.edu>'
IPBASE=192.168 IPBASE=192.168
DELAYCAPACITY=2 DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net
OURDOMAIN=emulab.net
...@@ -7,4 +7,7 @@ TBOPSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>' ...@@ -7,4 +7,7 @@ TBOPSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
TBLOGSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>' TBLOGSEMAIL='Leigh B Stoller <stoller@stoller.casco.net>'
IPBASE=192.168 IPBASE=192.168
DELAYCAPACITY=2 DELAYCAPACITY=2
BOSSNODE=stoller.casco.net
USERNODE=stoller.casco.net
MYDOMAIN=casco.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