Commit 8f0b2869 authored by David Johnson's avatar David Johnson

Bugfixes.

parent 5b886eee
......@@ -57,14 +57,14 @@ if [ "$HOSTNAME" = "$CONCENTRATOR" ]; then
$DIRNAME/setup-vpn.sh 1> $OURDIR/setup-vpn.log 2>&1
# Give the VPN a chance to settle down
PINGED=0
while [ $PINGED -eq 0 ]; do
sleep 2
ping -c 1 $CONTROLLER
if [ $? -eq 0 ]; then
PINGED=1
fi
done
#PINGED=0
#while [ $PINGED -eq 0 ]; do
# sleep 2
# ping -c 1 $CONTROLLER
# if [ $? -eq 0 ]; then
# PINGED=1
# fi
#done
fi
# Mark things as done right here, it's safe.
......
......@@ -103,7 +103,7 @@ if [ ! -f $OURDIR/vpn-server-done ]; then
#
# Get openvpn setup and restarted.
#
if [ $VPNTYPE -eq 'routed-privaddr' ]; then
if [ $VPNTYPE = 'routed-privaddr' ]; then
cat <<EOF > /etc/openvpn/server.conf
local $con_conlink_IP
port 1194
......@@ -127,10 +127,10 @@ verb 3
push "route $MLAN_NETWORK $MLAN_MASK"
EOF
elif [ $VPNTYPE -eq 'bridged' ]; then
elif [ $VPNTYPE = 'bridged' ]; then
echo "bridged VPNTYPE not yet supported!"
exit 1
elif [ $VPNTYPE -eq 'routed-pubaddr' ]; then
elif [ $VPNTYPE = 'routed-pubaddr' ]; then
echo "routed-pubaddr VPNTYPE not yet supported!"
exit 1
fi
......@@ -178,11 +178,16 @@ fi
mkdir -p /etc/openvpn/clients
for aggprefix in $AGGREGATES ; do
agglan="${aggprefix}lan"
eval "varname=${aggprefix}_HOST ; agghost=\$$varname"
eval "varname=${aggprefix}_GW ; agg_gw=\$$varname"
eval "varname=$agglan_NETWORK ; agg_net=\$$varname"
eval "varname=$agglan_MASK ; agg_mask=\$$varname"
eval "varname=$agglan_CIDR ; agg_cidr=\$$varname"
eval "varname=${aggprefix}_HOST"
eval "agghost=\$$varname"
eval "varname=${aggprefix}_GW"
eval "agg_gw=\$$varname"
eval "varname=$agglan_NETWORK"
eval "agg_net=\$$varname"
eval "varname=$agglan_MASK"
eval "agg_mask=\$$varname"
eval "varname=$agglan_CIDR"
eval "agg_cidr=\$$varname"
aggnum=`echo $aggprefix | sed -n -r -e 's/^agg([0-9]+)$/\1/p'`
node="${agghost}${aggprefix}"
......
......@@ -387,7 +387,7 @@ for i in range(1,params.numAggregates+1):
vhostToAggMap[vhost.client_id] = []
aggName = "agg%d" % (i)
aggToVhostMap[aggName] = vhost
#clientvars.addVariable("%s_HOST" % (aggName),vhost.client_id)
clientvars.addVariable("%s_HOST" % (aggName),vhost.client_id)
#
# Now create the aggregate: ctl, boss (nuc1,2,3)
#
......
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