Commit 83b8cebf authored by Leigh Stoller's avatar Leigh Stoller

Add ServerAlias to the RPC virtual hosts to avoid new TLS SNI

error in FreeBSD 10.
parent c844e2ef
...@@ -1125,10 +1125,9 @@ ServerAdmin @TBOPSEMAIL_NOSLASH@ ...@@ -1125,10 +1125,9 @@ ServerAdmin @TBOPSEMAIL_NOSLASH@
#TransferLog logs/ssl_access_log #TransferLog logs/ssl_access_log
LogLevel warn LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log 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 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 # Turn off TRACE and TRACK in the SSL virt host too
# #
...@@ -1322,10 +1321,12 @@ Listen @PROTOGENI_RPCPORT@ ...@@ -1322,10 +1321,12 @@ Listen @PROTOGENI_RPCPORT@
# General setup for the virtual host, inherited from global configuration # General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www" DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@ ServerName @PROTOGENI_RPCNAME@
ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@ ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log 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 TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch: # SSL Engine Switch:
...@@ -1499,10 +1500,12 @@ Listen @GENI_PUBRPCPORT@ ...@@ -1499,10 +1500,12 @@ Listen @GENI_PUBRPCPORT@
# General setup for the virtual host, inherited from global configuration # General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www" DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@ ServerName @PROTOGENI_RPCNAME@
ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@ ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log 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 TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch: # SSL Engine Switch:
...@@ -1667,10 +1670,12 @@ Listen 5001 ...@@ -1667,10 +1670,12 @@ Listen 5001
# General setup for the virtual host, inherited from global configuration # General setup for the virtual host, inherited from global configuration
DocumentRoot "@prefix@/www" DocumentRoot "@prefix@/www"
ServerName @PROTOGENI_RPCNAME@ ServerName @PROTOGENI_RPCNAME@
ServerAlias @BOSSNODE@
ServerAdmin @TBOPSEMAIL_NOSLASH@ ServerAdmin @TBOPSEMAIL_NOSLASH@
LogLevel warn LogLevel warn
ErrorLog @prefix@/log/apache_ssl_error_log 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 TransferLog @prefix@/log/apache_ssl_access_log
# SSL Engine Switch: # SSL Engine Switch:
......
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