Revert "apache: only show major/minor apache version in response header"

[chef.git] / cookbooks / apache / templates / default / ports.conf.erb

diff --git a/cookbooks/apache/templates/default/ports.conf.erb b/cookbooks/apache/templates/default/ports.conf.erb
index aa6d4e5e2e9099950a62901ff834294a7cce91bb..600f07ad1248c45f878cd9904288185aa7ff8637 100644 (file)
--- a/cookbooks/apache/templates/default/ports.conf.erb
+++ b/cookbooks/apache/templates/default/ports.conf.erb
@@ -1,23 +1,14 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Listen on port 80
-<% if node[:lsb][:release].to_f < 14.04 -%>
-NameVirtualHost *:80
-<% end -%>
 Listen <%= node[:apache][:listen_address] %>:80
 
 # Listen on port 443 if mod_ssl is enabled
 <IfModule mod_ssl.c>
-    <% if node[:lsb][:release].to_f < 14.04 -%>
-    NameVirtualHost *:443
-    <% end -%>
     Listen <%= node[:apache][:listen_address] %>:443
 </IfModule>
 
 # Listen on port 443 if mod_gnutls is enabled
 <IfModule mod_gnutls.c>
-    <% if node[:lsb][:release].to_f < 14.04 -%>
-    NameVirtualHost *:443
-    <% end -%>
     Listen <%= node[:apache][:listen_address] %>:443
 </IfModule>