Fix for PR 845

`use_optional_includes` should only be used for `additional_includes`, otherwise things don't work.
xbezdick · Feb 11, 2015 · 1581972 · 1581972
1 parent 8e5d051
commit 1581972
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1005,7 +1005,7 @@ Setting `add_listen` to 'false' stops the vhost from creating a Listen statement
 
 #####`use_optional_includes`
 
-Specifies if for apache > 2.4 it should use IncludeOptional instead of Include.
+Specifies if for apache > 2.4 it should use IncludeOptional instead of Include for `additional_includes`. Defaults to 'false'.
 
 #####`additional_includes`
 

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
@@ -64,7 +64,7 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
+<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"