Merge pull request #909 from igalic/no_default_vh_24

allow disabling default vhosts under 2.4
redhat-openstack · Nov 4, 2014 · 1101dae · 1101dae
2 parents c737616 + 88c6a98
commit 1101dae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
@@ -70,7 +70,11 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @vhost_load_dir %>/*"
+<%- else -%>
 Include "<%= @vhost_load_dir %>/*"
+<%- end -%>
 <% end -%>
 
 <% if @error_documents -%>