Commit 08048e68 authored by Leigh Stoller's avatar Leigh Stoller

Some minor cleanup in how we name the outerboss node and it XMLRPC server

port, and the location of the SSL certificate used to talk to the server
parent 9ae9aaf2
......@@ -892,6 +892,8 @@ fi
......@@ -935,7 +937,9 @@ JAILIPMASK=255.240.0.0
IPBASE=10
SFSSUPPORT=1
ELABINELAB=0
OUTERBOSSNODE=""
OUTERBOSS_NODENAME=""
OUTERBOSS_XMLRPCPORT=3069
OUTERBOSS_SSLCERTNAME="/etc/outer_emulab.pem"
PLABSUPPORT=0
PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
......@@ -1385,7 +1389,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1389: checking for a BSD compatible install" >&5
echo "configure:1393: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -1763,7 +1767,9 @@ s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
s%@TBMAINSITE@%$TBMAINSITE%g
s%@SFSSUPPORT@%$SFSSUPPORT%g
s%@ELABINELAB@%$ELABINELAB%g
s%@OUTERBOSSNODE@%$OUTERBOSSNODE%g
s%@OUTERBOSS_NODENAME@%$OUTERBOSS_NODENAME%g
s%@OUTERBOSS_XMLRPCPORT@%$OUTERBOSS_XMLRPCPORT%g
s%@OUTERBOSS_SSLCERTNAME@%$OUTERBOSS_SSLCERTNAME%g
s%@PLABSUPPORT@%$PLABSUPPORT%g
s%@TBLOGFACIL@%$TBLOGFACIL%g
s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g
......
......@@ -61,7 +61,9 @@ AC_SUBST(TBAUTHTIMEOUT)
AC_SUBST(TBMAINSITE)
AC_SUBST(SFSSUPPORT)
AC_SUBST(ELABINELAB)
AC_SUBST(OUTERBOSSNODE)
AC_SUBST(OUTERBOSS_NODENAME)
AC_SUBST(OUTERBOSS_XMLRPCPORT)
AC_SUBST(OUTERBOSS_SSLCERTNAME)
AC_SUBST(PLABSUPPORT)
AC_SUBST(TBLOGFACIL)
AC_SUBST(PLAB_ROOTBALL)
......@@ -127,7 +129,9 @@ JAILIPMASK=255.240.0.0
IPBASE=10
SFSSUPPORT=1
ELABINELAB=0
OUTERBOSSNODE=""
OUTERBOSS_NODENAME=""
OUTERBOSS_XMLRPCPORT=3069
OUTERBOSS_SSLCERTNAME="/etc/outer_emulab.pem"
PLABSUPPORT=0
PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
......
......@@ -36,7 +36,7 @@ DISABLE_NSE=1
# This means it is an inner elab!
ELABINELAB=1
# The name of the outer boss for inner boss to request services from.
OUTERBOSSNODE=changeme
OUTERBOSS_NODENAME=changeme
#
# SSL Certificate stuff. Used to customize config files in ssl directory.
# Note that OrganizationalUnit is set in the cnf file.
......
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