Commit 8cd76d49 authored by Leigh Stoller's avatar Leigh Stoller

Get rid of the localhost hack; the new image is 2.3 vserver and it

does the loopback device properly inside vservers. Also remove the
tmcd pem files from inside the vserver so that forced to go through
the proxy.
parent 5129f458
......@@ -123,6 +123,7 @@ sub PreparePhysNode();
sub fatal($);
sub getjailconfig($);
sub setjailoptions();
sub startproxy($);
sub mysystem($);
sub cleanup();
......@@ -429,6 +430,12 @@ sub mkvserver($)
mysystem("mkdir -p $vdir/local/logs")
if (! -e "$vdir/local/logs");
#
# Some security stuff; remove files that would enable it to talk to
# tmcd directly (only imortant on remote nodes). Must go through proxy.
#
mysystem("rm -f $vdir/$ETCDIR/*.pem");
#
# Now a bunch of stuff to set up a nice environment in the jail.
#
......@@ -522,12 +529,6 @@ sub mkvserver($)
unlink("$vdir/$BOOTDIR/vrunning")
if (-e "$vdir/$BOOTDIR/vrunning");
#
# vserver 2.2 does not support loopback devices inside, so redirect
# localhost so that testbed daemons can find the local pubsubd. This
# will come out when we have the virtual network stuff.
#
mysystem("echo '$IP\t\tlocalhost loghost' > $vdir/etc/hosts");
}
#
......
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