Merge pull request #2164 from hunner/patch/alt_userdir

Allow custom userdir directives

Author: david22swan

REFERENCE.md

@@ -6670,6 +6670,7 @@ The following parameters are available in the `apache::mod::userdir` class:
 
 * [`home`](#home)
 * [`dir`](#dir)
+* [`userdir`](#userdir)
 * [`disable_root`](#disable_root)
 * [`apache_version`](#apache_version)
 * [`path`](#path)
@@ -6694,6 +6695,14 @@ Data type: `Any`
 
 Default value: ``undef``
 
+##### <a name="userdir"></a>`userdir`
+
+Data type: `Optional[String[1]]`
+
+Path or directory name to be used as the UserDir.
+
+Default value: ``undef``
+
 ##### <a name="disable_root"></a>`disable_root`
 
 Data type: `Any`

manifests/mod/userdir.pp

@@ -6,7 +6,10 @@
 #   
 # @param dir
 #   *Deprecated* Path from user's home directory to public directory.
-# 
+#
+# @param userdir
+#   Path or directory name to be used as the UserDir.
+#
 # @param disable_root
 #   Toggles whether to allow use of root directory.
 # 
@@ -33,6 +36,7 @@
 class apache::mod::userdir (
   $home = undef,
   $dir = undef,
+  Optional[String[1]] $userdir = undef,
   $disable_root = true,
   $apache_version = undef,
   $path = '/home/*/public_html',
@@ -59,6 +63,8 @@
     $_path = $path
   }
 
+  $_userdir = pick($userdir, $_path)
+
   ::apache::mod { 'userdir': }
 
   # Template uses $home, $dir, $disable_root, $_apache_version

spec/classes/mod/userdir_spec.rb

@@ -39,12 +39,23 @@
     context 'with path set to something' do
       let :params do
         {
-          path: 'public_html /usr/web http://www.example.com/',
+          path: '/home/*/*/public_html',
         }
       end
 
-      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/\"\>$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+/home/\*/\*/public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
+    end
+    context 'with userdir set to something' do
+      let :params do
+        {
+          path: '/home/*/*/public_html',
+          userdir: 'public_html',
+        }
+      end
+
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*UserDir\s+public_html$}) }
+      it { is_expected.to contain_file('userdir.conf').with_content(%r{^\s*\<Directory\s+\"/home/\*/\*/public_html\"\>$}) }
     end
     context 'with unmanaged_path set to true' do
       let :params do

templates/mod/userdir.conf.erb

@@ -2,7 +2,7 @@
 <% if @disable_root -%>
   UserDir disabled root
 <% end -%>
-  UserDir <%= @_path %>
+  UserDir <%= @_userdir %>
 
 <%- if ! @unmanaged_path -%>
   <Directory "<%= @_path %>">