Merge pull request #204 from openquery/index_files_to_serverlevel

index_files to be defined at server level if specified in resource::vhost
voxpupuli · Dec 19, 2013 · ee70673 · ee70673
2 parents 5fa3141 + f338f30
commit ee70673
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -230,7 +230,7 @@
       fastcgi_script      => $fastcgi_script,
       try_files           => $try_files,
       www_root            => $www_root,
-      index_files         => $index_files,
+      index_files         => undef,
       location_custom_cfg => $location_custom_cfg,
       notify              => Class['nginx::service'],
     }

diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -31,6 +31,9 @@ server {
        return 301 https://$host$request_uri;
   }
 <% end -%>
+<% if @index_files -%>
+    index <% Array(index_files).each do |i| %> <%= i %><% end %>;
+<% end -%>
 
   access_log            <%= @access_log_real %>;
   error_log             <%= @error_log_real %>;

diff --git a/templates/vhost/vhost_location_directory.erb b/templates/vhost/vhost_location_directory.erb
@@ -18,7 +18,7 @@
     autoindex on;
 <% end -%>
 <% if @index_files -%>
-    index <% @index_files.each do |i| %> <%= i %><% end %>;
+    index <% Array(index_files).each do |i| %> <%= i %><% end %>;
 <% end -%>
 <% if defined? @auth_basic -%>
     auth_basic           "<%= @auth_basic %>";

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -20,6 +20,9 @@ server {
 <% if defined? @auth_basic_user_file -%>
   auth_basic_user_file      "<%= @auth_basic_user_file %>";
 <% end -%>
+<% if @index_files -%>
+    index <% Array(index_files).each do |i| %> <%= i %><% end %>;
+<% end -%>
 
   access_log            <%= @ssl_access_log %>;
   error_log             <%= @ssl_error_log %>;