From 52a9fb1c0e87a7d81c6f40e3ce7135cc6acb71ed Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 30 Dec 2018 15:20:56 -0600 Subject: [PATCH] roles/apache: Set ServerName in default SSL vhost The `ServerName` directive needs to be set inside the default SSL vhost, as this property does not get inherited from the global configuration, and it is needs to be set in order for SNI to work correctly. --- roles/apache/templates/ssl.conf.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/apache/templates/ssl.conf.j2 b/roles/apache/templates/ssl.conf.j2 index d9b9817..c24e7b3 100644 --- a/roles/apache/templates/ssl.conf.j2 +++ b/roles/apache/templates/ssl.conf.j2 @@ -58,7 +58,11 @@ SSLCryptoDevice builtin # General setup for the virtual host, inherited from global configuration #DocumentRoot "/var/www/html" +{% if apache_server_name is defined %} +ServerName {{ apache_server_name }} +{% else %} #ServerName www.example.com:443 +{% endif %} Include conf.d/ssl.include