Commit b9d8f28b authored by Leigh Stoller's avatar Leigh Stoller

Flush mailman ... we force MAILMANSUPPORT=0, but you should change

your defs file to avoid a warning.
parent 69c151c1
# #
# Copyright (c) 2000-2014 University of Utah and the Flux Group. # Copyright (c) 2000-2015 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -53,7 +53,7 @@ SUBDIRS = \ ...@@ -53,7 +53,7 @@ SUBDIRS = \
db assign www @optional_subdirs@ clientside ipod security sensors \ db assign www @optional_subdirs@ clientside ipod security sensors \
pxe tbsetup account tmcd utils backend tip ipod vis \ pxe tbsetup account tmcd utils backend tip ipod vis \
sensors os xmlrpc install/newnode_sshkeys mote tools/whol \ sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
tools/svn wiki bugdb collab node_usage install tools/svn wiki collab/exp-vis node_usage install
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
SUBDIRS += tools/rmanage SUBDIRS += tools/rmanage
endif endif
......
...@@ -6743,6 +6743,13 @@ if test "$TBMAINSITE" = 1; then ...@@ -6743,6 +6743,13 @@ if test "$TBMAINSITE" = 1; then
FANCYBANNER=1 FANCYBANNER=1
fi fi
# Mailman has been flushed
if test "$MAILMANSUPPORT" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Forcing MAILMANSUPPORT off, no longer supported. Change your defs files!" >&5
$as_echo "$as_me: WARNING: Forcing MAILMANSUPPORT off, no longer supported. Change your defs files!" >&2;}
MAILMANSUPPORT=0
fi
# #
# Get rid of old third-party distributions in the source tree since we now # Get rid of old third-party distributions in the source tree since we now
# unpack them in the build tree. In the case of tg2.0, it actually breaks # unpack them in the build tree. In the case of tg2.0, it actually breaks
...@@ -7024,18 +7031,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -7024,18 +7031,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/rspec-emulab/2/GNUmakefile \ protogeni/rspec-emulab/2/GNUmakefile \
apt/GNUmakefile \ apt/GNUmakefile \
collab/GNUmakefile \ collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/plone/GNUmakefile \
collab/jabber/GNUmakefile \
collab/mailman/GNUmakefile collab/cvstools/GNUmakefile \
collab/mailman/mmlistmembership \
collab/mailman/addmmlist collab/mailman/mmsetup \
collab/mailman/delmmlist collab/mailman/mmxlogin \
collab/mailman/genaliases collab/mailman/setmmlistmembers \
collab/mailman/mailmanproxy collab/mailman/setmmpasswd \
collab/cvstools/cvs.proxy collab/cvstools/cvs_ctrl \
collab/cvstools/cvsrepo_ctrl.proxy collab/cvstools/cvsrepo_ctrl \
collab/cvstools/webcvsrepo_ctrl \
collab/exp-vis/GNUmakefile collab/exp-vis/fetch-vis \ collab/exp-vis/GNUmakefile collab/exp-vis/fetch-vis \
node_usage/GNUmakefile node_usage/mk-plots \ node_usage/GNUmakefile node_usage/mk-plots \
node_usage/analy node_usage/publish \ node_usage/analy node_usage/publish \
......
...@@ -1118,6 +1118,12 @@ if test "$TBMAINSITE" = 1; then ...@@ -1118,6 +1118,12 @@ if test "$TBMAINSITE" = 1; then
FANCYBANNER=1 FANCYBANNER=1
fi fi
# Mailman has been flushed
if test "$MAILMANSUPPORT" = 1; then
AC_MSG_WARN([Forcing MAILMANSUPPORT off, no longer supported. Change your defs files!])
MAILMANSUPPORT=0
fi
# #
# Get rid of old third-party distributions in the source tree since we now # Get rid of old third-party distributions in the source tree since we now
# unpack them in the build tree. In the case of tg2.0, it actually breaks # unpack them in the build tree. In the case of tg2.0, it actually breaks
...@@ -1380,10 +1386,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1380,10 +1386,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
robots/mezzanine/mezzanine/GNUmakefile \ robots/mezzanine/mezzanine/GNUmakefile \
robots/tracker/GNUmakefile \ robots/tracker/GNUmakefile \
robots/mezzanine/mezzcal/GNUmakefile robots/robomonitord \ robots/mezzanine/mezzcal/GNUmakefile robots/robomonitord \
wiki/GNUmakefile wiki/addwikiuser wiki/wikiproxy \
wiki/usertemplate wiki/webhometemplate wiki/LocalSite.cfg \
wiki/delwikiuser wiki/setwikigroups wiki/addwikiproj \
bugdb/GNUmakefile bugdb/bugdbproxy \
protogeni/GNUmakefile protogeni/security/GNUmakefile \ protogeni/GNUmakefile protogeni/security/GNUmakefile \
protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \ protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \ protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
...@@ -1394,18 +1396,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1394,18 +1396,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/rspec-emulab/2/GNUmakefile \ protogeni/rspec-emulab/2/GNUmakefile \
apt/GNUmakefile \ apt/GNUmakefile \
collab/GNUmakefile \ collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/plone/GNUmakefile \
collab/jabber/GNUmakefile \
collab/mailman/GNUmakefile collab/cvstools/GNUmakefile \
collab/mailman/mmlistmembership \
collab/mailman/addmmlist collab/mailman/mmsetup \
collab/mailman/delmmlist collab/mailman/mmxlogin \
collab/mailman/genaliases collab/mailman/setmmlistmembers \
collab/mailman/mailmanproxy collab/mailman/setmmpasswd \
collab/cvstools/cvs.proxy collab/cvstools/cvs_ctrl \
collab/cvstools/cvsrepo_ctrl.proxy collab/cvstools/cvsrepo_ctrl \
collab/cvstools/webcvsrepo_ctrl \
collab/exp-vis/GNUmakefile collab/exp-vis/fetch-vis \ collab/exp-vis/GNUmakefile collab/exp-vis/fetch-vis \
node_usage/GNUmakefile node_usage/mk-plots \ node_usage/GNUmakefile node_usage/mk-plots \
node_usage/analy node_usage/publish \ node_usage/analy node_usage/publish \
......
...@@ -30,12 +30,13 @@ sub usage() { ...@@ -30,12 +30,13 @@ sub usage() {
print("Usage: genelists [-d] [-n] -a\n". print("Usage: genelists [-d] [-n] -a\n".
"Usage: genelists [-d] [-n] [-m] -u user\n". "Usage: genelists [-d] [-n] [-m] -u user\n".
"Usage: genelists [-d] [-n] -p project\n". "Usage: genelists [-d] [-n] -p project\n".
"Usage: genelists [-d] [-n] -t\n". "Usage: genelists [-d] [-n] [-P | -t]\n".
"where:\n". "where:\n".
" -d - Turn on debugging\n". " -d - Turn on debugging\n".
" -n - Impotent mode\n". " -n - Impotent mode\n".
" -u - Generate lists for a user; add -m for new email address\n". " -u - Generate lists for a user; add -m for new email address\n".
" -p - Generate lists for a project (includes subgroups)\n". " -p - Generate lists for a project (includes subgroups)\n".
" -P - Generate lists for all projects (includes subgroups)\n".
" -t - Generate activity lists\n". " -t - Generate activity lists\n".
" -c - Generate just the current users list\n". " -c - Generate just the current users list\n".
" -a - Generate all email lists; careful ...\n"); " -a - Generate all email lists; careful ...\n");
...@@ -52,11 +53,12 @@ sub ProjectLeaders(); ...@@ -52,11 +53,12 @@ sub ProjectLeaders();
sub ProjectLists($$); sub ProjectLists($$);
sub genelist($$$$); sub genelist($$$$);
my $optlist = "anu:p:tdmfc"; my $optlist = "anu:p:tdmfcP";
my $debug = 0; my $debug = 0;
my $all = 0; my $all = 0;
my $update = 0; my $update = 0;
my $activity= 0; my $activity= 0;
my $projects= 0;
my $current = 0; my $current = 0;
my $impotent= 0; my $impotent= 0;
my $force = 0; my $force = 0;
...@@ -141,6 +143,9 @@ if (defined($options{"a"})) { ...@@ -141,6 +143,9 @@ if (defined($options{"a"})) {
if (defined($options{"m"})) { if (defined($options{"m"})) {
$update = 1; $update = 1;
} }
if (defined($options{"P"})) {
$projects = 1;
}
if (defined($options{"t"})) { if (defined($options{"t"})) {
$activity = 1; $activity = 1;
} }
...@@ -280,12 +285,12 @@ WideAreaPeople() ...@@ -280,12 +285,12 @@ WideAreaPeople()
ProjectLeaders() ProjectLeaders()
if ($all || defined($user) || defined($pid)); if ($all || defined($user) || defined($pid));
if ($all || defined($user) || defined($pid)) { if ($all || $projects || defined($user) || defined($pid)) {
my $query; my $query;
my $phash = {}; my $phash = {};
my $query_result; my $query_result;
if ($all) { if ($all || $projects) {
$query = "select g.pid,g.gid from groups as g ". $query = "select g.pid,g.gid from groups as g ".
"left join projects as p on p.pid=g.pid ". "left join projects as p on p.pid=g.pid ".
"where p.approved=1 and p.nonlocal_id is null ". "where p.approved=1 and p.nonlocal_id is null ".
...@@ -543,7 +548,7 @@ sub genelist($$$$) ...@@ -543,7 +548,7 @@ sub genelist($$$$)
my($query_result, $inituserlist, $listname, $usemailman) = @_; my($query_result, $inituserlist, $listname, $usemailman) = @_;
print "Processing $listname at: \t".time()." \t(". print "Processing $listname at: \t".time()." \t(".
$query_result->numrows()." entries)\n" if $debug; $query_result->numrows()." entries)\n" if $debug>1;
open(LIST,"> $tempfile") || open(LIST,"> $tempfile") ||
fatal("Couldn't open $tempfile: $!\n"); fatal("Couldn't open $tempfile: $!\n");
...@@ -564,9 +569,9 @@ sub genelist($$$$) ...@@ -564,9 +569,9 @@ sub genelist($$$$)
} }
# HACK! These special accounts should be flagged in the DB # HACK! These special accounts should be flagged in the DB
next next
if ($usemailman && if ($usemailman && $MAILMANSUPPORT &&
(!defined($uid) || ($uid eq "elabman" || $uid eq "elabckup" || ($uid eq "elabman" || $uid eq "elabckup" ||
$uid eq "operator"))); $uid eq "operator"));
if ($usemailman && $MAILMANSUPPORT) { if ($usemailman && $MAILMANSUPPORT) {
print LIST "$uid $user_email $mailman_password '$user_name'\n"; print LIST "$uid $user_email $mailman_password '$user_name'\n";
...@@ -592,7 +597,7 @@ sub genelist($$$$) ...@@ -592,7 +597,7 @@ sub genelist($$$$)
if (-e "$ELISTS/$listname" && if (-e "$ELISTS/$listname" &&
system("cmp -s $tempfile $ELISTS/$listname") == 0) { system("cmp -s $tempfile $ELISTS/$listname") == 0) {
print "$listname has not changed. Skipping.\n" print "$listname has not changed. Skipping.\n"
if ($debug); if ($debug && !$force);
if (!$force) { if (!$force) {
unlink("$tempfile"); unlink("$tempfile");
return; return;
......
...@@ -82,7 +82,7 @@ PUBSUPPORT=1 ...@@ -82,7 +82,7 @@ PUBSUPPORT=1
WIKISUPPORT=0 WIKISUPPORT=0
TRACSUPPORT=0 TRACSUPPORT=0
BUGDBSUPPORT=0 BUGDBSUPPORT=0
MAILMANSUPPORT=1 MAILMANSUPPORT=0
SFSSUPPORT=0 SFSSUPPORT=0
CVSSUPPORT=0 CVSSUPPORT=0
STAMPS=1 STAMPS=1
......
...@@ -35,16 +35,16 @@ TBMAINSITE=0 ...@@ -35,16 +35,16 @@ TBMAINSITE=0
THISHOMEBASE=changeme THISHOMEBASE=changeme
PLABSUPPORT=0 PLABSUPPORT=0
PELABSUPPORT=0 PELABSUPPORT=0
WIKISUPPORT=changeme WIKISUPPORT=0
BUGDBSUPPORT=changeme BUGDBSUPPORT=0
MAILMANSUPPORT=changeme MAILMANSUPPORT=0
OPSDBSUPPORT=changeme OPSDBSUPPORT=0
WINSUPPORT=0 WINSUPPORT=0
NSVERIFY=changeme NSVERIFY=changeme
NOSHAREDFS=changeme NOSHAREDFS=changeme
NFSRACY=changeme NFSRACY=changeme
SFSSUPPORT=0 SFSSUPPORT=0
CVSSUPPORT=changeme CVSSUPPORT=0
NFSTRACESUPPORT=0 NFSTRACESUPPORT=0
ARCHIVESUPPORT=changeme ARCHIVESUPPORT=changeme
NTPSERVER=changeme NTPSERVER=changeme
......
...@@ -452,8 +452,13 @@ FRISEBEENUMPORTS=0 ...@@ -452,8 +452,13 @@ FRISEBEENUMPORTS=0
NOSTACKMIB=0 NOSTACKMIB=0
# #
# Only supported on the Mother Ship (emulab.net) right now. # Deprecated and should always be zero.
# #
ARCHIVESUPPORT=0
SFSSUPPORT=0
PELABSUPPORT=0
PLABSUPPORT=0
PLAB_ROOTBALL="plabroot-18.tar.bz2"
WIKISUPPORT=0 WIKISUPPORT=0
BUGDBSUPPORT=0 BUGDBSUPPORT=0
MAILMANSUPPORT=0 MAILMANSUPPORT=0
...@@ -462,15 +467,6 @@ CHATSUPPORT=0 ...@@ -462,15 +467,6 @@ CHATSUPPORT=0
NFSTRACESUPPORT=0 NFSTRACESUPPORT=0
OPSDBSUPPORT=0 OPSDBSUPPORT=0
#
# Deprecated and should always be zero.
#
ARCHIVESUPPORT=0
SFSSUPPORT=0
PELABSUPPORT=0
PLABSUPPORT=0
PLAB_ROOTBALL="plabroot-18.tar.bz2"
# #
# You shouldn't have to change anything below this point # You shouldn't have to change anything below this point
# #
......
#
# Kill off mailman.
#
use strict;
use libinstall;
use installvars;
my $GENELISTS = "$TBROOT/sbin/genelists";
my $MAILMANALIAS = "/etc/mail/aliases.mailman";
sub InstallUpdate($$)
{
my ($version, $phase) = @_;
#
# If something should run in the pre-install phase.
#
if ($phase eq "pre") {
#
# Kill off aliases.mailman from sendmail.cf on ops.
#
Phase "config", "Editing $SENDMAIL_CF on $USERNODE", sub {
my $cmd = "$SSH -o 'BatchMode=yes' root\@${USERNODE} ".
" sed -i .orig -e '/AliasFile=/s\\\;,$MAILMANALIAS\\\;\\\;' ".
" $SENDMAIL_CF";
ExecQuietFatal($cmd);
$cmd = "$SSH -o 'BatchMode=yes' root\@${USERNODE} ".
" sed -i .orig -e '/AliasFile=/s\\\;=$MAILMANALIAS,\\\;=\\\;' ".
" $SENDMAIL_CF";
ExecQuietFatal($cmd);
};
Phase "newaliases", "Running newaliases on user node", sub {
ExecQuietFatal("$SSH -o 'BatchMode=yes' ".
" root\@${USERNODE} $NEWALIASES");
};
Phase "sendmail", "Restarting sendmail on user node", sub {
ExecQuietFatal("$SSH -o 'BatchMode=yes' root\@${USERNODE} ".
" /etc/rc.d/sendmail restart");
};
}
#
# If something should run in the post-install phase.
#
if ($phase eq "post") {
Phase "elists", "Regenerating ALL projects email lists.", sub {
ExecQuietFatal("$GENELISTS -d -f -P");
};
}
return 0;
}
1;
# Local Variables:
# mode:perl
# End:
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