X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cc1f1fd20bceb53641f3dfe5e9e4b4045072671d..3b563e12600d3519011cde414ee0465698a7814f:/cookbooks/apache/templates/default/ports.conf.erb?ds=inline

diff --git a/cookbooks/apache/templates/default/ports.conf.erb b/cookbooks/apache/templates/default/ports.conf.erb
index aa6d4e5e2..600f07ad1 100644
--- 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>