summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-10-08 03:11:26 -0400
committerJesse Luehrs <doy@tozt.net>2018-10-08 03:11:26 -0400
commit45e9b9be235d51d6ce36dbb58578398df78d2c34 (patch)
tree4466ec870b0cb5f813b747eb75c3dd3761b189cc
parente31f1563f29f0d4c0fd25ce59a189c8d24767375 (diff)
downloadpuppet-tozt-45e9b9be235d51d6ce36dbb58578398df78d2c34.tar.gz
puppet-tozt-45e9b9be235d51d6ce36dbb58578398df78d2c34.zip
don't duplicate package declarations when installing for multiple users
-rw-r--r--modules/conf/manifests/init.pp5
-rw-r--r--modules/package/manifests/cargo.pp2
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp
index 5e7c0dc..03da3a5 100644
--- a/modules/conf/manifests/init.pp
+++ b/modules/conf/manifests/init.pp
@@ -7,9 +7,10 @@ define conf($user=$name, $home=undef) {
default => $home,
}
- package::cargo { 'fancy-prompt':
- ensure => installed,
+ package::cargo { "fancy-prompt for $user":
+ package => 'fancy-prompt',
user => $user,
+ ensure => installed,
}
exec { "git clone doy/conf for $user":
diff --git a/modules/package/manifests/cargo.pp b/modules/package/manifests/cargo.pp
index 9a5af1c..799d28e 100644
--- a/modules/package/manifests/cargo.pp
+++ b/modules/package/manifests/cargo.pp
@@ -1,4 +1,4 @@
-define package::cargo($user, $ensure) {
+define package::cargo($package, $user, $ensure) {
case $ensure {
'installed': {
exec { "cargo install $name":