Do not tie manage_user with mpm param

diff --git a/manifests/site.pp b/manifests/site.pp
index 24dba9b8bdd69123e45fbe64a8b31a96a9366e69..63c97c88773226dfe0c459e00689d0d76188b90c 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -63,7 +63,6 @@ define apache::site(
 
   apache::site::user { $name:
     ensure         => $ensure,
-    mpm            => $mpm,
     manage_user    => $manage_user,
     user           => $user,
     password       => $password,

diff --git a/manifests/site/user.pp b/manifests/site/user.pp
index ec5866cb8994c95d2b40c980c2df10e2e313089c..b1fe071102de3075d80fd8f3654d509196409ca5 100644 (file)
--- a/manifests/site/user.pp
+++ b/manifests/site/user.pp
@@ -1,6 +1,5 @@
 define apache::site::user(
   $ensure          = present,
-  $mpm             = true,
   $manage_user     = true,
   $user            = $name,
   $gid             = $name,
@@ -12,7 +11,8 @@ define apache::site::user(
   $groups          = '',
   $shell           = '/bin/false',
 ){
-  if $mpm == true and $manage_user == true and $user != 'root' {
+  #if $mpm == true and $manage_user == true and $user != 'root' {
+  if $manage_user == true and $user != 'root' {
     if $ensure == present {
       if !defined(Group[$gid]) {
         group { "$gid":