summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-06 18:58:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-06 18:58:24 -0300
commit8657ad789bd15d4e67479b89af2969f6b48c5ae2 (patch)
tree8da5d372d79a6131ce3550a9f5613ffc77f6f4bb
parent091461ded7805a11d39f052ee1682bf99607209c (diff)
downloadpuppet-apache-8657ad789bd15d4e67479b89af2969f6b48c5ae2.tar.gz
puppet-apache-8657ad789bd15d4e67479b89af2969f6b48c5ae2.tar.bz2
Do not tie manage_user with mpm param
-rw-r--r--manifests/site.pp1
-rw-r--r--manifests/site/user.pp4
2 files changed, 2 insertions, 3 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index 24dba9b..63c97c8 100644
--- 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 ec5866c..b1fe071 100644
--- 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":