Merge pull request #1077 from ivaldi/configurable_options_for_userdir

Make Options directive configurable for mod userdir
xbezdick · Mar 26, 2015 · 53d7c42 · 53d7c42
2 parents 3fd2131 + 66c6651
commit 53d7c42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/manifests/mod/userdir.pp b/manifests/mod/userdir.pp
@@ -3,6 +3,7 @@
   $dir = 'public_html',
   $disable_root = true,
   $apache_version = $::apache::apache_version,
+  $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
 ) {
   ::apache::mod { 'userdir': }
 

diff --git a/templates/mod/userdir.conf.erb b/templates/mod/userdir.conf.erb
@@ -6,7 +6,7 @@
 
   <Directory "<%= @home %>/*/<%= @dir %>">
     AllowOverride FileInfo AuthConfig Limit Indexes
-    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+    Options <%= @options.join(' ') %>
     <Limit GET POST OPTIONS>
       <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       Require all denied