NameVirtualHost is not needed in apache 2.4

[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 dbb43568f80afc27cfe64c029d964dd0b50808ff..aa6d4e5e2e9099950a62901ff834294a7cce91bb 100644 (file)
--- a/cookbooks/apache/templates/default/ports.conf.erb
+++ b/cookbooks/apache/templates/default/ports.conf.erb
@@ -1,17 +1,23 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Listen on port 80
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Listen on port 80

+<% if node[:lsb][:release].to_f < 14.04 -%>

 NameVirtualHost *:80
 NameVirtualHost *:80

+<% end -%>

 Listen <%= node[:apache][:listen_address] %>:80
 
 # Listen on port 443 if mod_ssl is enabled
 <IfModule mod_ssl.c>
 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
     NameVirtualHost *:443

+    <% end -%>

     Listen <%= node[:apache][:listen_address] %>:443
 </IfModule>
 
 # Listen on port 443 if mod_gnutls is enabled
 <IfModule mod_gnutls.c>
     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
     NameVirtualHost *:443

+    <% end -%>

     Listen <%= node[:apache][:listen_address] %>:443
 </IfModule>
     Listen <%= node[:apache][:listen_address] %>:443
 </IfModule>