From 01cfdf12fb1c08c84345b4c5cf850273cfd6fa9b Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 6 Jan 2015 14:45:27 +0000 Subject: [PATCH] Revert "Trying to match whitespace......." This reverts commit f8733de4e5f986591d7801a51ab1961ff7ff0a2e. --- roles/httpd/website/templates/website.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/httpd/website/templates/website.conf b/roles/httpd/website/templates/website.conf index e61241be5d..755772b6c4 100644 --- a/roles/httpd/website/templates/website.conf +++ b/roles/httpd/website/templates/website.conf @@ -18,8 +18,8 @@ Include "conf.d/{{ name }}/*.conf" {% endif %} - {% if ssl %} + ServerName {{ name }} {% if server_aliases %} @@ -46,6 +46,6 @@ SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK Include "conf.d/{{ name }}/*.conf" -{% endif %} - + +{% endif %}