Use @WWWHOST@ in both places so that they agree (no warnings from the

browser). This came up in elabinelab cause WWWHOST (www.myemulab.x.y.z) is
not an exported (from outer emulab) CNAME for the bossnode, so I have to
set WWWHOST equal to BOSSNODE, which causes the browser to complain.

apache/httpd.conf.in

@@ -1152,7 +1152,7 @@ SSLLogLevel info
 
 #  General setup for the virtual host
 DocumentRoot "@prefix@/www"
-ServerName www.@OURDOMAIN@
+ServerName @WWWHOST@
 ServerAdmin @TBOPSEMAIL@
 ErrorLog @prefix@/log/apache_error_log
 TransferLog @prefix@/log/apache_access_log

ssl/apache.cnf.in

@@ -16,7 +16,7 @@ O                      = @SSLCERT_ORGNAME@
 OU                     = Server
 # The apache server wants the CommonName (CN) to match what we set "ServerName"
 # to in apache/http.conf.in (in the SSL section).
-CN                     = www.@OURDOMAIN@
+CN                     = @WWWHOST@
 emailAddress           = @TBOPSEMAIL@
 
 [ req_attributes ]