Commit 935fc8bf authored by Leigh Stoller's avatar Leigh Stoller

Removed hardwired active-users and all-users email list names from

genelists and move to defs file (default and mini). If not specified,
defaults back to whatever TBOPSEMAIL is.
parent c364fcb6
......@@ -17,6 +17,8 @@ TBROOT = @prefix@
TBDBNAME = @TBDBNAME@
TBOPSEMAIL = @TBOPSEMAIL@
TBLOGSEMAIL = @TBLOGSEMAIL@
TBACTIVEARCHIVE = @TBACTIVEARCHIVE@
TBUSERSARCHIVE = @TBUSERSARCHIVE@
BOSSNODE = @BOSSNODE@
USERNODE = @USERNODE@
FSNODE = @FSNODE@
......
......@@ -823,6 +823,8 @@ fi
#
# Okay, I know this is improper usage of --with. Too bad.
#
......@@ -900,6 +902,17 @@ EOF
TBOPSEMAIL="`echo $TBOPSEMAIL | sed -e 's/@/\\\@/'`"
TBLOGSEMAIL="`echo $TBLOGSEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
else
TBACTIVEARCHIVE="$TBOPSEMAIL"
fi
if test -n "$TBUSERSARCHIVE"; then
TBUSERSARCHIVE="`echo $TBUSERSARCHIVE | sed -e 's/@/\\\@/'`"
else
TBUSERSARCHIVE="$TBOPSEMAIL"
fi
#
# LEDA library path
#
......@@ -1029,7 +1042,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:1033: checking for a BSD compatible install" >&5
echo "configure:1046: 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
......@@ -1297,6 +1310,8 @@ s%@TBDBNAME@%$TBDBNAME%g
s%@WWWDEFS@%$WWWDEFS%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g
s%@TBUSERSARCHIVE@%$TBUSERSARCHIVE%g
s%@DELAYCAPACITY@%$DELAYCAPACITY%g
s%@IPBASE@%$IPBASE%g
s%@BOSSNODE@%$BOSSNODE%g
......
......@@ -22,6 +22,8 @@ AC_SUBST(TBDBNAME)
AC_SUBST(WWWDEFS)
AC_SUBST(TBOPSEMAIL)
AC_SUBST(TBLOGSEMAIL)
AC_SUBST(TBACTIVEARCHIVE)
AC_SUBST(TBUSERSARCHIVE)
AC_SUBST(DELAYCAPACITY)
AC_SUBST(IPBASE)
AC_SUBST(BOSSNODE)
......@@ -77,6 +79,17 @@ AC_DEFINE_UNQUOTED(FSDIR_USERS, "$FSDIR_USERS")
TBOPSEMAIL="`echo $TBOPSEMAIL | sed -e 's/@/\\\@/'`"
TBLOGSEMAIL="`echo $TBLOGSEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
else
TBACTIVEARCHIVE="$TBOPSEMAIL"
fi
if test -n "$TBUSERSARCHIVE"; then
TBUSERSARCHIVE="`echo $TBUSERSARCHIVE | sed -e 's/@/\\\@/'`"
else
TBUSERSARCHIVE="$TBOPSEMAIL"
fi
#
# LEDA library path
#
......
......@@ -13,10 +13,8 @@ my $optlist = "";
my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@";
my $USERS = "@USERNODE@";
# Should be configure variable!
my $TBACTIVE = "testbed-active-users-archive\@flux.cs.utah.edu";
my $TBALL = "testbed-users-archive\@flux.cs.utah.edu";
my $TBACTIVE = "@TBACTIVEARCHIVE@";
my $TBALL = "@TBUSERSARCHIVE@";
# Note no -n option. We redirect stdin from the new exports file below.
my $SSH = "$TB/bin/sshtb -l root $USERS";
......
......@@ -8,6 +8,8 @@ TBDBNAME=tbdb
WWWDEFS=default
TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>'
TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
BOSSNODE=boss.emulab.net
......
......@@ -8,6 +8,8 @@ TBDBNAME=tbdb
WWWDEFS=mini
TBOPSEMAIL=minitestbed-ops@flux.cs.utah.edu
TBLOGSEMAIL=minitestbed-logs@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
IPBASE=192.168
DELAYCAPACITY=2
BOSSNODE=boss.mini.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