Merge pull request #759 from caezs/master

Change the site-include regexp to work better with Debian/Ubuntu...
xbezdick · Jun 4, 2014 · 71a1d9a · 71a1d9a
2 parents 39d5aca + 78ee7ff
commit 71a1d9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -293,7 +293,7 @@
         it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
       end
 
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*\.conf"$} }
+      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
       it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
     end

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
@@ -67,7 +67,7 @@ IncludeOptional "<%= @confd_dir %>/*.conf"
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
-Include "<%= @vhost_load_dir %>/*.conf"
+Include "<%= @vhost_load_dir %>/*"
 <% end -%>
 
 <% if @error_documents -%>