diff --git a/manifests/init.pp b/manifests/init.pp index 52812b3..25cccae 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,10 +3,21 @@ # # Copyright (C) 2007 admin@immerda.ch # Copyright 2008, Puzzle ITC -# Marcel Härry haerry+puppet(at)puzzle.ch +# Marcel Harry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # # This program is free software; you can redistribute # it and/or modify it under the terms of the GNU # General Public License version 3 as published by # the Free Software Foundation. + +class user ( + $managed_hash = {}, + ) { + + if $managed_hash != {} { + validate_hash($managed_hash) + create_resources('user::managed', $managed_hash) + } + +} diff --git a/manifests/managed.pp b/manifests/managed.pp index bdcbed1..bf7f7ec 100644 --- a/manifests/managed.pp +++ b/manifests/managed.pp @@ -93,24 +93,24 @@ or !empty($sshkey_content) or !empty($sshkeys_content) { file { "${real_homedir}_ssh": - ensure => $dir_ensure, - path => "${real_homedir}/.ssh", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => $homedir_mode, + ensure => $dir_ensure, + path => "${real_homedir}/.ssh", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => $homedir_mode, } } if $sshkey_source != '' { file { "${real_homedir}_ssh_keys": - ensure => $ensure, - path => "${real_homedir}/.ssh/authorized_keys2", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => '0600', - source => "puppet:///modules/${sshkey_source}", + ensure => $ensure, + path => "${real_homedir}/.ssh/authorized_keys2", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => '0600', + source => "puppet:///modules/${sshkey_source}", } } @@ -135,50 +135,50 @@ if $id_rsa_source != '' { file { "${real_homedir}_ssh_id_rsa": - ensure => $ensure, - path => "${real_homedir}/.ssh/id_rsa", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => '0600', - source => "puppet:///modules/${id_rsa_source}", + ensure => $ensure, + path => "${real_homedir}/.ssh/id_rsa", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => '0600', + source => "puppet:///modules/${id_rsa_source}", } } if $id_rsa_pub_source != '' { file { "${real_homedir}_ssh_id_rsa_pub": - ensure => $ensure, - path => "${real_homedir}/.ssh/id_rsa.pub", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => '0644', - source => "puppet:///modules/${id_rsa_pub_source}", + ensure => $ensure, + path => "${real_homedir}/.ssh/id_rsa.pub", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => '0644', + source => "puppet:///modules/${id_rsa_pub_source}", } } if $known_hosts_source != '' { file { "${real_homedir}_known_hosts": - ensure => $ensure, - path => "${real_homedir}/.ssh/known_hosts", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => '0600', - source => "puppet:///modules/${known_hosts_source}", + ensure => $ensure, + path => "${real_homedir}/.ssh/known_hosts", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => '0600', + source => "puppet:///modules/${known_hosts_source}", } } if $bashprofile_source != '' { file { "${real_homedir}/.bash_profile": - ensure => $ensure, - path => "${real_homedir}/.bash_profile", - require => File[$real_homedir], - owner => $name, - group => $name, - mode => '0644', - source => "puppet:///modules/${bashprofile_source}", + ensure => $ensure, + path => "${real_homedir}/.bash_profile", + require => File[$real_homedir], + owner => $name, + group => $name, + mode => '0644', + source => "puppet:///modules/${bashprofile_source}", } } @@ -186,9 +186,9 @@ file{$real_homedir: } if $ensure == 'absent' { File[$real_homedir]{ - ensure => absent, - purge => true, - force => true, + ensure => absent, + purge => true, + force => true, recurse => true, } } else {