Commit a6a171db authored by Leigh Stoller's avatar Leigh Stoller

Remove elvin from the meta ports and the install scripts. Replaced

with pubsub stuff now.
parent df211f73
......@@ -189,7 +189,7 @@ if ($SCRATCHDIR) {
my @LOGFILES = ("$LOGDIR/bootinfo.log", "$LOGDIR/tmcd.log",
"$LOGDIR/capture.log", "$LOGDIR/dhcpd.log", "$LOGDIR/capserver.log",
"$LOGDIR/frisbeed.log", "$LOGDIR/proxydhcpd.log",
"$LOGDIR/elvind.log", "$LOGDIR/stated.log", "$LOGDIR/osselect.log",
"$LOGDIR/stated.log", "$LOGDIR/osselect.log",
"$LOGDIR/tftpd.log", "$LOGDIR/sdcollectd.log", "$LOGDIR/genlastlog.log",
"$LOGDIR/sshxmlrpc.log", "$LOGDIR/plabgetfree.log", "$LOGDIR/xmlrpcbag.log",
"$LOGDIR/plabrenew.log", "$LOGDIR/sslxmlrpc.log", "$LOGDIR/pubsubd.log");
......@@ -248,9 +248,6 @@ my $OBJDIR = `/usr/bin/dirname $0`;
chomp $OBJDIR;
my $TOP_OBJDIR = "$OBJDIR/..";
my $ELVIND_CONF = "/usr/local/etc/elvind.conf";
my $BOSS_ELVIND_CONF = "$TOP_OBJDIR/event/etc/elvind-boss.conf";
#
# Allow this to work if the library is left in the source directory
#
......@@ -610,8 +607,6 @@ Phase "rc.d", "Setting up rc.d scripts", sub {
DoneIfDoesntExist("$RCDIR/elvind.sh");
ExecQuietFatal("/bin/rm -f $RCDIR/elvind.sh");
};
DoneIfExists("$RCDIR/3.testbed.sh");
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/rc.d install");
};
};
......@@ -653,7 +648,6 @@ Phase "syslog", "Setting up syslog", sub {
"!tftpd", "*.*\t\t\t\t\t\t$LOGDIR/tftpd.log",
"!capserver", "*.*\t\t\t\t\t\t$LOGDIR/capserver.log",
"!frisbeed", "*.*\t\t\t\t\t\t$LOGDIR/frisbeed.log",
"!elvind", "*.*\t\t\t\t\t\t$LOGDIR/elvind.log",
"!pubsubd", "*.*\t\t\t\t\t\t$LOGDIR/pubsubd.log",
"!stated", "*.*\t\t\t\t\t\t$LOGDIR/stated.log",
"!osselect", "*.*\t\t\t\t\t\t$LOGDIR/osselect.log",
......@@ -704,7 +698,6 @@ Phase "syslog", "Setting up syslog", sub {
"$LOGDIR/dhcpd.log 640 7 200 * Z",
"$LOGDIR/bootinfo.log 640 7 200 * Z",
"$LOGDIR/capserver.log 640 5 200 * Z",
"$LOGDIR/elvind.log 640 5 1000 * Z",
"$LOGDIR/pubsubd.log 640 5 1000 * Z",
"$LOGDIR/suexec.log 640 3 200 * Z",
"$LOGDIR/genlastlog.log 640 3 200 * Z",
......
......@@ -240,8 +240,6 @@ if ($SCRATCHDIR) {
#
# A few files we have to deal with
#
my $ELVIND_CONF = "/usr/local/etc/elvind.conf";
my $OPS_ELVIND_CONF = "$TOP_OBJDIR/event/etc/elvind-ops.conf";
my $M2CRYPTO_PATCH = "$TOP_SRCDIR/patches/m2crypto.patch";
my $MAILMAN_PATCH = "$TOP_SRCDIR/patches/mailman.patch";
my $IDENTPUB = "$TOP_SRCDIR/install/identity.pub";
......@@ -930,13 +928,6 @@ Phase "capture", "Setting up capture", sub {
};
};
Phase "event", "Setting up event system", sub {
Phase "elvinconf", "Installing elvind config file", sub {
DoneIfIdentical($ELVIND_CONF,$OPS_ELVIND_CONF);
ExecQuietFatal("$CP $OPS_ELVIND_CONF $ELVIND_CONF");
};
};
Phase "rc.d", "Setting up rc.d scripts", sub {
Phase "rsyncd", "Removing rsyncd startup script", sub {
DoneIfDoesntExist("$RCDIR/rsyncd.sh");
......@@ -971,8 +962,6 @@ Phase "rc.d", "Setting up rc.d scripts", sub {
DoneIfDoesntExist("$RCDIR/elvind.sh");
ExecQuietFatal("/bin/rm -f $RCDIR/elvind.sh");
};
DoneIfExists("$RCDIR/2.elvind.sh");
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/rc.d control-install");
};
};
......
......@@ -53,7 +53,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 \
vin4.2:${PORTSDIR}/misc/libelvin \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
RUN_DEPENDS= \
......@@ -76,7 +76,6 @@ RUN_DEPENDS= \
rpm:${PORTSDIR}/archivers/rpm \
xvcg:${PORTSDIR}/graphics/vcg \
${LOCALBASE}/libexec/tftpd:${PORTSDIR}/misc/emulab-tftp-hpa \
${LOCALBASE}/libexec/elvind:${PORTSDIR}/misc/elvind \
sudo:${PORTSDIR}/security/sudo \
dhcpd:${PORTSDIR}/net/isc-dhcp3-server \
wget:${PORTSDIR}/ftp/wget \
......
......@@ -54,7 +54,7 @@ MAINTAINER= ricci@cs.utah.edu
.MAKEFLAGS+= -DBATCH
LIB_DEPENDS= lthread.[23]:${PORTSDIR}/devel/linuxthreads \
vin4.2:${PORTSDIR}/misc/libelvin \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
.if ${OSMAJOR} >= 6
......@@ -69,7 +69,6 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
wget:${PORTSDIR}/ftp/wget \
${LOCALBASE}/libexec/elvind:${PORTSDIR}/misc/elvind \
${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto \
.if ${OSMAJOR} >= 6
......
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