Commit f32486d2 authored by Robert Ricci's avatar Robert Ricci

Make OURDOMAIN default to boss's domain name, so that we don't expose

it to the user - it was a source of confusion.
parent 317d2959
...@@ -1051,6 +1051,15 @@ else ...@@ -1051,6 +1051,15 @@ else
TBUSERSARCHIVE="$TBOPSEMAIL" TBUSERSARCHIVE="$TBOPSEMAIL"
fi fi
# Default OURDOMAIN to the domain name of the boss node
# This is gross beyond all description - autoconf changes m4's quote characters
# to '[' and ']', which prevents them from working in the sed expression below.
# So, we temporarily change them to something else then change them back.
# Note: In newer versions of autoconf, this can be done with 'quadrigraphs'
if test -z "$OURDOMAIN"; then
OURDOMAIN="`echo $BOSSNODE | sed -E -e 's/^[a-zA-Z0-9\-]+\.//'`"
fi
if test -z "$TBAUTHDOMAIN"; then if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN=".$OURDOMAIN" TBAUTHDOMAIN=".$OURDOMAIN"
fi fi
...@@ -1298,7 +1307,7 @@ fi ...@@ -1298,7 +1307,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1302: checking for a BSD compatible install" >&5 echo "configure:1311: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
......
...@@ -196,6 +196,17 @@ else ...@@ -196,6 +196,17 @@ else
TBUSERSARCHIVE="$TBOPSEMAIL" TBUSERSARCHIVE="$TBOPSEMAIL"
fi fi
# Default OURDOMAIN to the domain name of the boss node
# This is gross beyond all description - autoconf changes m4's quote characters
# to '[' and ']', which prevents them from working in the sed expression below.
# So, we temporarily change them to something else then change them back.
# Note: In newer versions of autoconf, this can be done with 'quadrigraphs'
changequote(START, END)dnl
if test -z "$OURDOMAIN"; then
OURDOMAIN="`echo $BOSSNODE | sed -E -e 's/^[a-zA-Z0-9\-]+\.//'`"
fi
changequote([, ])dnl
if test -z "$TBAUTHDOMAIN"; then if test -z "$TBAUTHDOMAIN"; then
TBAUTHDOMAIN=".$OURDOMAIN" TBAUTHDOMAIN=".$OURDOMAIN"
fi fi
......
...@@ -12,9 +12,6 @@ THISHOMEBASE=Example.Emulab.Net ...@@ -12,9 +12,6 @@ THISHOMEBASE=Example.Emulab.Net
# Various domain and host names # Various domain and host names
# #
# Domain this testbed resides in
OURDOMAIN=example.emulab.net
# Host name of our web server (or host:port) # Host name of our web server (or host:port)
WWWHOST=www.example.emulab.net WWWHOST=www.example.emulab.net
......
...@@ -119,7 +119,8 @@ and is generally helpful if things go wrong with the nameserver. ...@@ -119,7 +119,8 @@ and is generally helpful if things go wrong with the nameserver.
SSL certificates - Our apache config file expects to find SSL certificates in: SSL certificates - Our apache config file expects to find SSL certificates in:
/usr/local/etc/apache/ssl.crt/www.<sitename>.crt and /usr/local/etc/apache/ssl.crt/www.<sitename>.crt and
/usr/local/etc/apache/ssl.key/www.<sitename>.key /usr/local/etc/apache/ssl.key/www.<sitename>.key
(where <sitename> is OURDOMAIN from the configure defs file.) (where <sitename> is OURDOMAIN from the configure defs file, which defaults to
boss's domain name.)
Generate a passwordless certificate (up to you if you want to get a 'real' one Generate a passwordless certificate (up to you if you want to get a 'real' one
from Verisign, etc., or sign your own), and place the files from it in the from Verisign, etc., or sign your own), and place the files from it in the
above locations. above locations.
......
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