From 83b8cebfeb0bdefa58d7d367ca7b26d97d0bc007 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Thu, 28 Aug 2014 12:40:34 -0600
Subject: [PATCH] Add ServerAlias to the RPC virtual hosts to avoid new TLS SNI
error in FreeBSD 10.
---
apache/v2/httpd.conf.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apache/v2/httpd.conf.in b/apache/v2/httpd.conf.in
index 9423c59113..00d83cec62 100644
--- a/apache/v2/httpd.conf.in
+++ b/apache/v2/httpd.conf.in
@@ -1125,10 +1125,9 @@ ServerAdmin @TBOPSEMAIL_NOSLASH@
#TransferLog logs/ssl_access_log
LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log
+LogFormat "%h %v %l %u %t %T \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
TransferLog @prefix@/log/apache_ssl_access_log
-LogFormat "%h %l %u %t %T \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
-
#
# Turn off TRACE and TRACK in the SSL virt host too
#
@@ -1322,10 +1321,12 @@ Listen @PROTOGENI_RPCPORT@
# General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@
+ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log
+LogFormat "%h %v %l %u %t %T \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch:
@@ -1499,10 +1500,12 @@ Listen @GENI_PUBRPCPORT@
# General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@
+ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log
+LogFormat "%h %v %l %u %t %T \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch:
@@ -1667,10 +1670,12 @@ Listen 5001
# General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@
+ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log
+LogFormat "%h %v %l %u %t %T \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch:
--
GitLab