Commit 7af67dbf authored by Leigh Stoller's avatar Leigh Stoller

Make project email lists a configure variable, defaults to off.

parent 59259db3
......@@ -819,6 +819,7 @@ NFSTRACESUPPORT
OPSDBSUPPORT
BUGDBSUPPORT
MAILMANSUPPORT
PROJECTMAILLISTS
WIKISUPPORT
PUBSUPPORT
PLABSUPPORT
......@@ -5105,6 +5106,7 @@ WIKISUPPORT=0
BUGDBSUPPORT=0
OPSDBSUPPORT=0
MAILMANSUPPORT=0
PROJECTMAILLISTS=0
WINSUPPORT=0
NSVERIFY=1
CVSSUPPORT=0
......
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -191,6 +191,7 @@ AC_SUBST(BUGDBSUPPORT)
AC_SUBST(OPSDBSUPPORT)
AC_SUBST(NFSTRACESUPPORT)
AC_SUBST(NTPSERVER)
AC_SUBST(PROJECTMAILLISTS)
AC_SUBST(EXTERNAL_NTPSERVER1)
AC_SUBST(EXTERNAL_NTPSERVER2)
AC_SUBST(EXTERNAL_NTPSERVER3)
......@@ -395,6 +396,7 @@ WIKISUPPORT=0
BUGDBSUPPORT=0
OPSDBSUPPORT=0
MAILMANSUPPORT=0
PROJECTMAILLISTS=0
WINSUPPORT=0
NSVERIFY=1
CVSSUPPORT=0
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -47,8 +47,6 @@ sub ActiveUsers();
sub RecentUsers();
sub RecentProjects();
sub RecentProjectLeaders();
sub Users();
sub WideAreaPeople();
sub ProjectLeaders();
sub ProjectLists($$);
sub genelist($$$$);
......@@ -75,6 +73,7 @@ my $TBALL = "@TBUSERSARCHIVE@";
my $ELISTS = "$TB/lists";
my $ELABINELAB = @ELABINELAB@;
my $MAILMANSUPPORT= @MAILMANSUPPORT@;
my $PROJECTMAILLISTS = @PROJECTMAILLISTS@;
my $MMPROG = "$TB/sbin/setmmlistmembers";
my $PGENISUPPORT= @PROTOGENI_SUPPORT@;
......@@ -276,12 +275,6 @@ RecentProjects()
RecentProjectLeaders()
if ($all || $activity || $update);
Users()
if ($all || defined($user));
WideAreaPeople()
if ($all || defined($user));
ProjectLeaders()
if ($all || defined($user) || defined($pid));
......@@ -454,43 +447,6 @@ sub RecentProjectLeaders()
"emulab-recently-active-project-leaders", 0);
}
#
# All active users of the testbed.
#
sub Users()
{
my $userlist;
my $query_result;
print "Getting All Users\n" if $debug;
if (! ($query_result =
DBQuery("SELECT DISTINCT usr_email FROM users ".
"where status='active' order by usr_email"))) {
DBFatal("Getting Users!");
}
$userlist = "$TBOPS\n";
$userlist .= "$TBALL";
genelist($query_result, $userlist, "emulab-allusers", 0);
}
#
# Special list for people approved to use the widearea-nodes.
#
sub WideAreaPeople()
{
my $query_result =
DBQueryFatal("SELECT DISTINCT u.usr_email from projects as p ".
"left join group_membership as m on m.pid_idx=p.pid_idx ".
"left join users as u on u.uid_idx=m.uid_idx ".
"where p.approved!=0 and p.pcremote_ok is not null ".
" and m.trust!='none' and u.status='active' ".
"order by usr_email");
genelist($query_result, "$TBOPS", "emulab-widearea-users", 0);
}
#
# Another list of project leaders.
#
......@@ -516,6 +472,9 @@ sub ProjectLists($$)
my ($pid, $gid) = @_;
my $proj_result;
return
if (!$PROJECTMAILLISTS);
print "Getting project members for $pid/$gid\n" if $debug;
my $query_result =
......
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