summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-12-05 17:29:47 +0000
committermh <mh@immerda.ch>2008-12-05 17:29:47 +0000
commitd7edb606bc08b53abd16d219e85394a3dd9c78b1 (patch)
treea9c8307806665a02598712ad621bd0e7a881abd2
parent9e55abd8b92e538c9b08cceca54a385e952be34a (diff)
adjusted to boolean usage
-rw-r--r--manifests/defines.pp58
1 files changed, 27 insertions, 31 deletions
diff --git a/manifests/defines.pp b/manifests/defines.pp
index 36067a1..07fa8b0 100644
--- a/manifests/defines.pp
+++ b/manifests/defines.pp
@@ -25,14 +25,14 @@ define user::managed(
$uid = 'absent',
$gid = 'uid',
$groups = [],
- $manage_group = 'true',
+ $manage_group = true,
$membership = 'minimum',
$homedir = 'absent',
- $managehome = 'true',
+ $managehome = true,
$homedir_mode = '0750',
$sshkey = 'absent',
$password = 'absent',
- $password_crypted = 'true',
+ $password_crypted = true,
$shell = 'absent'
){
@@ -66,23 +66,21 @@ define user::managed(
}
- case $managehome {
- 'true': {
- file{"$real_homedir":
- ensure => directory,
- require => User[$name],
- owner => $name, mode => $homedir_mode;
- }
- case $gid {
- 'absent','uid': {
- File[$real_homedir]{
- group => $name,
- }
+ if $managehome {
+ file{"$real_homedir":
+ ensure => directory,
+ require => User[$name],
+ owner => $name, mode => $homedir_mode;
+ }
+ case $gid {
+ 'absent','uid': {
+ File[$real_homedir]{
+ group => $name,
}
- default: {
- File[$real_homedir]{
- group => $gid,
- }
+ }
+ default: {
+ File[$real_homedir]{
+ group => $gid,
}
}
}
@@ -124,16 +122,14 @@ define user::managed(
case $name {
root: {}
default: {
- case $manage_group {
- 'true': {
- group { $name:
- allowdupe => false,
- ensure => present,
- }
- if $real_gid {
- Group[$name]{
- gid => $real_gid,
- }
+ if $manage_group {
+ group { $name:
+ allowdupe => false,
+ ensure => present,
+ }
+ if $real_gid {
+ Group[$name]{
+ gid => $real_gid,
}
}
}
@@ -186,12 +182,12 @@ define user::managed(
# gid: by default it will take the same as the uid
define user::sftp_only(
- $managehome = 'false',
+ $managehome = false,
$uid = 'absent',
$gid = 'uid',
$homedir_mode = '0750',
$password = 'absent',
- $password_crypted = 'true'
+ $password_crypted = true,
) {
include user::groups::sftponly
user::managed{"${name}":