Commit 0e6ddf82 authored by Mac Newbold's avatar Mac Newbold

Add a new configure var for TBAUTOMAILEMAIL. Defaults to TBLOGSEMAIL if

none is set.

Set TBAUTOMAILEMAIL in defs-default to testbed-automail@flux.utah.edu

Change quotamail to use bcc automail instead of tb-ops. Still says from
tb-ops, though, so that they reply to the right place.
parent 3690d8dc
...@@ -24,7 +24,7 @@ do ...@@ -24,7 +24,7 @@ do
cat << MESSAGE cat << MESSAGE
From: Testbed Operations <@TBOPSEMAIL_NOSLASH@> From: Testbed Operations <@TBOPSEMAIL_NOSLASH@>
To: $i@@OURDOMAIN@ To: $i@@OURDOMAIN@
Cc: Testbed Operations <@TBOPSEMAIL_NOSLASH@> Bcc: @TBAUTOMAILEMAIL_NOSLASH@
Subject: over disk quota at @THISHOMEBASE@ Subject: over disk quota at @THISHOMEBASE@
Hello, Hello,
......
...@@ -886,6 +886,8 @@ fi ...@@ -886,6 +886,8 @@ fi
# #
# Defaults for for above variables. # Defaults for for above variables.
...@@ -997,6 +999,13 @@ TBSTATEDEMAIL="`echo $TBSTATEDEMAIL | sed -e 's/@/\\\@/'`" ...@@ -997,6 +999,13 @@ TBSTATEDEMAIL="`echo $TBSTATEDEMAIL | sed -e 's/@/\\\@/'`"
TBTESTSUITEEMAIL_NOSLASH="$TBTESTSUITEEMAIL_NOSLASH" TBTESTSUITEEMAIL_NOSLASH="$TBTESTSUITEEMAIL_NOSLASH"
TBTESTSUITEEMAIL="`echo $TBTESTSUITEEMAIL | sed -e 's/@/\\\@/'`" TBTESTSUITEEMAIL="`echo $TBTESTSUITEEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBAUTOMAILEMAIL"; then
TBAUTOMAILEMAIL_NOSLASH="$TBAUTOMAILEMAIL_NOSLASH"
TBAUTOMAILEMAIL="`echo $TBAUTOMAILEMAIL | sed -e 's/@/\\\@/'`"
else
TBAUTOMAILEMAIL_NOSLASH="$TBLOGSEMAIL_NOSLASH"
TBAUTOMAILEMAIL="$TBLOGSEMAIL"
fi
if test -n "$TBACTIVEARCHIVE"; then if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE" TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE"
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`" TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
...@@ -1271,7 +1280,7 @@ fi ...@@ -1271,7 +1280,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:1275: checking for a BSD compatible install" >&5 echo "configure:1284: 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
...@@ -1609,6 +1618,8 @@ s%@TBSTATEDEMAIL@%$TBSTATEDEMAIL%g ...@@ -1609,6 +1618,8 @@ s%@TBSTATEDEMAIL@%$TBSTATEDEMAIL%g
s%@TBSTATEDEMAIL_NOSLASH@%$TBSTATEDEMAIL_NOSLASH%g s%@TBSTATEDEMAIL_NOSLASH@%$TBSTATEDEMAIL_NOSLASH%g
s%@TBTESTSUITEEMAIL@%$TBTESTSUITEEMAIL%g s%@TBTESTSUITEEMAIL@%$TBTESTSUITEEMAIL%g
s%@TBTESTSUITEEMAIL_NOSLASH@%$TBTESTSUITEEMAIL_NOSLASH%g s%@TBTESTSUITEEMAIL_NOSLASH@%$TBTESTSUITEEMAIL_NOSLASH%g
s%@TBAUTOMAILEMAIL@%$TBAUTOMAILEMAIL%g
s%@TBAUTOMAILEMAIL_NOSLASH@%$TBAUTOMAILEMAIL_NOSLASH%g
s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g s%@TBACTIVEARCHIVE@%$TBACTIVEARCHIVE%g
s%@TBACTIVEARCHIVE_NOSLASH@%$TBACTIVEARCHIVE_NOSLASH%g s%@TBACTIVEARCHIVE_NOSLASH@%$TBACTIVEARCHIVE_NOSLASH%g
s%@TBUSERSARCHIVE@%$TBUSERSARCHIVE%g s%@TBUSERSARCHIVE@%$TBUSERSARCHIVE%g
......
...@@ -72,6 +72,8 @@ AC_SUBST(TBSTATEDEMAIL) ...@@ -72,6 +72,8 @@ AC_SUBST(TBSTATEDEMAIL)
AC_SUBST(TBSTATEDEMAIL_NOSLASH) AC_SUBST(TBSTATEDEMAIL_NOSLASH)
AC_SUBST(TBTESTSUITEEMAIL) AC_SUBST(TBTESTSUITEEMAIL)
AC_SUBST(TBTESTSUITEEMAIL_NOSLASH) AC_SUBST(TBTESTSUITEEMAIL_NOSLASH)
AC_SUBST(TBAUTOMAILEMAIL)
AC_SUBST(TBAUTOMAILEMAIL_NOSLASH)
AC_SUBST(TBACTIVEARCHIVE) AC_SUBST(TBACTIVEARCHIVE)
AC_SUBST(TBACTIVEARCHIVE_NOSLASH) AC_SUBST(TBACTIVEARCHIVE_NOSLASH)
AC_SUBST(TBUSERSARCHIVE) AC_SUBST(TBUSERSARCHIVE)
...@@ -149,6 +151,13 @@ TBSTATEDEMAIL="`echo $TBSTATEDEMAIL | sed -e 's/@/\\\@/'`" ...@@ -149,6 +151,13 @@ TBSTATEDEMAIL="`echo $TBSTATEDEMAIL | sed -e 's/@/\\\@/'`"
TBTESTSUITEEMAIL_NOSLASH="$TBTESTSUITEEMAIL_NOSLASH" TBTESTSUITEEMAIL_NOSLASH="$TBTESTSUITEEMAIL_NOSLASH"
TBTESTSUITEEMAIL="`echo $TBTESTSUITEEMAIL | sed -e 's/@/\\\@/'`" TBTESTSUITEEMAIL="`echo $TBTESTSUITEEMAIL | sed -e 's/@/\\\@/'`"
if test -n "$TBAUTOMAILEMAIL"; then
TBAUTOMAILEMAIL_NOSLASH="$TBAUTOMAILEMAIL_NOSLASH"
TBAUTOMAILEMAIL="`echo $TBAUTOMAILEMAIL | sed -e 's/@/\\\@/'`"
else
TBAUTOMAILEMAIL_NOSLASH="$TBLOGSEMAIL_NOSLASH"
TBAUTOMAILEMAIL="$TBLOGSEMAIL"
fi
if test -n "$TBACTIVEARCHIVE"; then if test -n "$TBACTIVEARCHIVE"; then
TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE" TBACTIVEARCHIVE_NOSLASH="$TBACTIVEARCHIVE"
TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`" TBACTIVEARCHIVE="`echo $TBACTIVEARCHIVE | sed -e 's/@/\\\@/'`"
......
...@@ -14,6 +14,7 @@ TBAPPROVALEMAIL=testbed-approval@flux.cs.utah.edu ...@@ -14,6 +14,7 @@ TBAPPROVALEMAIL=testbed-approval@flux.cs.utah.edu
TBAUDITEMAIL=testbed-audit@flux.cs.utah.edu TBAUDITEMAIL=testbed-audit@flux.cs.utah.edu
TBSTATEDEMAIL=testbed-stated@flux.utah.edu TBSTATEDEMAIL=testbed-stated@flux.utah.edu
TBTESTSUITEEMAIL=testbed-testsuite@flux.utah.edu TBTESTSUITEEMAIL=testbed-testsuite@flux.utah.edu
TBAUTOMAILEMAIL=testbed-automail@flux.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
......
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