Added unmanaged_path and custom_fragment options to userdir

manifests/mod/userdir.pp

@@ -21,6 +21,12 @@
 # 
 # @param options
 #   Configures what features are available in a particular directory.
+#
+# @param unmanaged_path
+#   Toggles whether to manage path in userdir.conf
+#
+# @param custom_fragment
+#   Custom configuration to be added to userdir.conf
 # 
 # @see https://httpd.apache.org/docs/current/mod/mod_userdir.html for additional documentation.
 #
@@ -32,6 +38,8 @@
   $path = '/home/*/public_html',
   $overrides = [ 'FileInfo', 'AuthConfig', 'Limit', 'Indexes' ],
   $options = [ 'MultiViews', 'Indexes', 'SymLinksIfOwnerMatch', 'IncludesNoExec' ],
+  $unmanaged_path = false,
+  $custom_fragment = undef,
 ) {
   include ::apache
   $_apache_version = pick($apache_version, $apache::apache_version)

spec/classes/mod/userdir_spec.rb

@@ -55,5 +55,24 @@
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html /usr/web http://www\.example\.com/$}) }
       it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"public_html /usr/web http://www\.example\.com/\"\>$}) }
     end
+    context 'with unmanaged_path set to true' do
+      let :params do
+        {
+          unmanaged_path: true,
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/public_html$}) }
+      it { is_expected.not_to contain_file('userdir.conf').with_content(%r{^\s*\<Directory }) }
+    end
+    context 'with custom_fragment set to something' do
+      let :params do
+        {
+          custom_fragment: 'custom_test_string',
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{custom_test_string}) }
+    end
   end
 end

templates/mod/userdir.conf.erb

@@ -4,6 +4,7 @@
 <% end -%>
   UserDir <%= @_path %>
 
+<%- if ! @unmanaged_path -%>
   <Directory "<%= @_path %>">
     AllowOverride <%= @overrides.join(' ') %>
     Options <%= @options.join(' ') %>
@@ -24,4 +25,8 @@
       <%- end -%>
     </LimitExcept>
   </Directory>
+<%- end -%>
+<%- if @custom_fragment -%>
+<%= @custom_fragment %>
+<%- end -%>
 </IfModule>