fix bug in regex

sous-chefs · May 11, 2015 · 6cb7d79 · 6cb7d79
1 parent f595b7d
commit 6cb7d79
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/templates/default/apache2.conf.erb b/templates/default/apache2.conf.erb
@@ -91,7 +91,14 @@ AccessFileName <%= node['apache']['access_file_name'] %>
 # The following lines prevent .htaccess and .htpasswd files from being
 # viewed by Web clients.
 #
-<Files ~ "^\.ht">
+<% access_file_name_prefix = node['apache']['access_file_name'][0..2] if !node['apache']['access_file_name'].empty?
+   if access_file_name_prefix != '.ht'
+    file_name_prefix = '(' + access_file_name_prefix + '|.ht)'
+   else
+    file_name_prefix = '.ht'
+   end
+%>
+<Files ~ "^<%= file_name_prefix %>">
     <% if node['apache']['version'] == '2.2' -%>
     Order allow,deny
     Deny from all