Managin docroot by default; parameter changes

diff --git a/manifests/init.pp b/manifests/init.pp
index a1391e38607335f1b2f71383fe02205e06993848..df4fce7c2b8fde429a816642b0c9d950cee8da10 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -102,8 +102,9 @@ class apache {
               $redirect_match = false, $protocol = 'http', $aliases = false,
               $server_alias = false, $use = false, $ticket = false,
               $source = false, $template = 'apache/site.erb', $filename = '',
-              $manage_docroot = false, $owner = '', $group = '',
-              $mpm = true, $password = '*', $comment = '', $sshkey = absent,
+              $manage_docroot = true, $owner = 'root', $group = 'root',
+              $mpm = true, $mpm_user = '', $mpm_group = '', $password = '*',
+              $comment = '', $sshkey = absent,
               $groups = '', $shell = '/bin/false') {
 
     $vhost = $filename ? {
@@ -116,17 +117,17 @@ class apache {
       default => $base_domain,
     }
 
-    $user = $owner ? {
-      ''      => $title,
-      default => $owner,
-    }
+    if $mpm == true and $user != 'root' {
+      $user = $mpm_user ? {
+        ''      => $title,
+        default => $mpm_user,
+      }
 
-    $gid = $group ? {
-      ''      => $title,
-      default => $group,
-    }
+      $gid = $mpm_group? {
+        ''      => $title,
+        default => $mpm_group,
+      }
 
-    if $mpm == true and $user != 'root' {
       if !defined(User["$user"]) {
         user::manage { "$user":
           tag      => "virtual",
@@ -188,8 +189,8 @@ class apache {
           if !defined(File["${docroot}"]) {
             file { "${docroot}":
               ensure  => present,
-              owner   => $user,
-              group   => $gid,
+              owner   => $owner,
+              group   => $group,
               mode    => 0755,
               recurse => false,
             }