Skip to content

Commit 1581972

Browse files
author
Morgan Haskel
committed
Fix for PR 845
`use_optional_includes` should only be used for `additional_includes`, otherwise things don't work.
1 parent 8e5d051 commit 1581972

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ Setting `add_listen` to 'false' stops the vhost from creating a Listen statement
10051005

10061006
#####`use_optional_includes`
10071007

1008-
Specifies if for apache > 2.4 it should use IncludeOptional instead of Include.
1008+
Specifies if for apache > 2.4 it should use IncludeOptional instead of Include for `additional_includes`. Defaults to 'false'.
10091009

10101010
#####`additional_includes`
10111011

templates/httpd.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ LogFormat "<%= format -%>" <%= nickname %>
6464
<%- end -%>
6565
<% end -%>
6666

67-
<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
67+
<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
6868
IncludeOptional "<%= @confd_dir %>/*.conf"
6969
<%- else -%>
7070
Include "<%= @confd_dir %>/*.conf"

0 commit comments

Comments
 (0)