opuppet/module-user
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

new style for 2.7

Browse source
This commit is contained in:
mh 2012-06-05 22:45:46 +02:00
parent 8a4f8f5d0f
commit 8cc313a49d
5 changed files with 223 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
manifests/managed.pp
View file

@ -50,7 +50,7 @@ define user::managed(
}
$real_shell = $shell ? {
'absent' => $operatingsystem ? {
'absent' => $::operatingsystem ? {
openbsd => "/usr/local/bin/bash",
default => "/bin/bash",
},
@ -130,7 +130,7 @@ define user::managed(
group{$name:
ensure => absent,
}
case $operatingsystem {
case $::operatingsystem {
OpenBSD: {
Group[$name]{
before => User[$name],
@ -155,7 +155,7 @@ define user::managed(
}
}
if $ensure == 'absent' {
case $operatingsystem {
case $::operatingsystem {
OpenBSD: {
Group[$name]{
before => User[$name],
@ -185,7 +185,7 @@ define user::managed(
}
if $password != 'absent' {
case $operatingsystem {
case $::operatingsystem {
openbsd: {
exec { "setpass ${name}":
unless => "grep -q '^${name}:${password}:' /etc/master.passwd",

4
manifests/sftp_only.pp
View file

@ -10,7 +10,7 @@ define user::sftp_only(
$password_crypted = true
) {
require user::groups::sftponly
user::managed{"${name}":
user::managed{$name:
ensure => $ensure,
uid => $uid,
gid => $gid,
@ -19,7 +19,7 @@ define user::sftp_only(
managehome => $managehome,
homedir => $homedir,
homedir_mode => $homedir_mode,
shell => $operatingsystem ? {
shell => $::operatingsystem ? {
debian => '/usr/sbin/nologin',
ubuntu => '/usr/sbin/nologin',
default => '/sbin/nologin'