Commit 9b98ceae authored by Leigh Stoller's avatar Leigh Stoller

Add TBADMINGROUP config variable. Defaults to "flux" for us, and in

fact is defaulted in configure.in but can be overridden in the defs
file. Changed the one perl script that had a hardwired flux group. The
other dozen or so uses are in the web page code. I'll do those next.
parent 73276714
...@@ -15,6 +15,7 @@ exec_prefix = @exec_prefix@ ...@@ -15,6 +15,7 @@ exec_prefix = @exec_prefix@
TBROOT = @prefix@ TBROOT = @prefix@
TBDBNAME = @TBDBNAME@ TBDBNAME = @TBDBNAME@
TBADMINGROUP = @TBADMINGROUP@
TBOPSEMAIL = @TBOPSEMAIL@ TBOPSEMAIL = @TBOPSEMAIL@
TBLOGSEMAIL = @TBLOGSEMAIL@ TBLOGSEMAIL = @TBLOGSEMAIL@
TBACTIVEARCHIVE = @TBACTIVEARCHIVE@ TBACTIVEARCHIVE = @TBACTIVEARCHIVE@
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#undef VERSION #undef VERSION
#undef TBDBNAME #undef TBDBNAME
#undef TBADMINGROUP
#undef IPBASE #undef IPBASE
#undef BOSSNODE #undef BOSSNODE
#undef USERNODE #undef USERNODE
......
...@@ -825,6 +825,12 @@ fi ...@@ -825,6 +825,12 @@ fi
#
# Defaults for for above variables.
#
TBADMINGROUP="flux"
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
# #
...@@ -863,6 +869,10 @@ cat >> confdefs.h <<EOF ...@@ -863,6 +869,10 @@ cat >> confdefs.h <<EOF
#define TBDBNAME "$TBDBNAME" #define TBDBNAME "$TBDBNAME"
EOF EOF
cat >> confdefs.h <<EOF
#define TBADMINGROUP "$TBADMINGROUP"
EOF
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define IPBASE "$IPBASE" #define IPBASE "$IPBASE"
EOF EOF
...@@ -1042,7 +1052,7 @@ fi ...@@ -1042,7 +1052,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:1046: checking for a BSD compatible install" >&5 echo "configure:1056: 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
...@@ -1308,6 +1318,7 @@ s%@STRIP@%$STRIP%g ...@@ -1308,6 +1318,7 @@ s%@STRIP@%$STRIP%g
s%@SSH@%$SSH%g s%@SSH@%$SSH%g
s%@TBDBNAME@%$TBDBNAME%g s%@TBDBNAME@%$TBDBNAME%g
s%@WWWDEFS@%$WWWDEFS%g s%@WWWDEFS@%$WWWDEFS%g
s%@TBADMINGROUP@%$TBADMINGROUP%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g
......
...@@ -20,6 +20,7 @@ AC_CHECK_TOOL(SSH,ssh) ...@@ -20,6 +20,7 @@ AC_CHECK_TOOL(SSH,ssh)
# #
AC_SUBST(TBDBNAME) AC_SUBST(TBDBNAME)
AC_SUBST(WWWDEFS) AC_SUBST(WWWDEFS)
AC_SUBST(TBADMINGROUP)
AC_SUBST(TBOPSEMAIL) AC_SUBST(TBOPSEMAIL)
AC_SUBST(TBLOGSEMAIL) AC_SUBST(TBLOGSEMAIL)
AC_SUBST(TBACTIVEARCHIVE) AC_SUBST(TBACTIVEARCHIVE)
...@@ -34,6 +35,11 @@ AC_SUBST(FSDIR_PROJ) ...@@ -34,6 +35,11 @@ AC_SUBST(FSDIR_PROJ)
AC_SUBST(FSDIR_GROUPS) AC_SUBST(FSDIR_GROUPS)
AC_SUBST(FSDIR_USERS) AC_SUBST(FSDIR_USERS)
#
# Defaults for for above variables.
#
TBADMINGROUP="flux"
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
# #
...@@ -64,6 +70,7 @@ fi ...@@ -64,6 +70,7 @@ fi
# Be sure to add to config.h.in! # Be sure to add to config.h.in!
# #
AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME") AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME")
AC_DEFINE_UNQUOTED(TBADMINGROUP, "$TBADMINGROUP")
AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE") AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE")
AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE") AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE")
AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE") AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE")
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# #
TBDBNAME=tbdb TBDBNAME=tbdb
WWWDEFS=default WWWDEFS=default
TBADMINGROUP=flux
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
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# #
TBDBNAME=tbdb TBDBNAME=tbdb
WWWDEFS=mini WWWDEFS=mini
TBADMINGROUP=flux
TBOPSEMAIL=minitestbed-ops@flux.cs.utah.edu TBOPSEMAIL=minitestbed-ops@flux.cs.utah.edu
TBLOGSEMAIL=minitestbed-logs@flux.cs.utah.edu TBLOGSEMAIL=minitestbed-logs@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
......
...@@ -15,6 +15,7 @@ sub usage() ...@@ -15,6 +15,7 @@ sub usage()
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $TESTMODE = @TESTMODE@; my $TESTMODE = @TESTMODE@;
my $TBPID = "@TBADMINGROUP@";
# #
# Testbed Support libraries # Testbed Support libraries
...@@ -28,7 +29,6 @@ $| = 1; ...@@ -28,7 +29,6 @@ $| = 1;
my $SSH = "$TB/bin/sshtb -n -l root "; my $SSH = "$TB/bin/sshtb -n -l root ";
my $PROG = "/usr/testbed/sbin/console_setup.proxy"; my $PROG = "/usr/testbed/sbin/console_setup.proxy";
my $TBPID = "flux";
my %cmdargs = (); my %cmdargs = ();
my @row; my @row;
......
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