Skip to content
This repository was archived by the owner on Jun 11, 2019. It is now read-only.

Integrating user::managed with Hiera #4

Open
tiengo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Integrating user::managed with Hiera #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5190e30
added integration with hiera
tiengo May 18, 2015
77f0bc4
fix some lints
tiengo Jun 3, 2015
7456957
fix utf error
tiengo Sep 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != {} {
Copy link
Member

@alvagante alvagante Jun 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To keep some coherency with other similar cases, I'd call this parameter $users_hash or $managed_users_hash.
The rest is ok for me

Copy link
Author

@tiengo tiengo Jul 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i thought that was ${resourcetype_name}_hash =)
i'll change to $managed_users_hash

validate_hash($managed_hash)
create_resources('user::managed', $managed_hash)
}

}
88 changes: 44 additions & 44 deletions manifests/managed.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
}
}

Expand All @@ -135,60 +135,60 @@

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}",
}
}

if $managehome {
file{$real_homedir: }
if $ensure == 'absent' {
File[$real_homedir]{
ensure => absent,
purge => true,
force => true,
ensure => absent,
purge => true,
force => true,
recurse => true,
}
} else {
Expand Down