summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/package.pp
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-11 17:00:20 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-11 17:00:20 -0400
commit57d8ecf86f49db2c9e367480e380a73cad4b71e6 (patch)
tree473263b26fdb525e7e7c90efbf919b9d3f02dd99 /manifests/puppetmaster/package.pp
parent0f0434a582c1f3bd274a79e51ab34a2f4887e659 (diff)
parentfc72cbc8a9d09b2d305df061dfc74cc960610d85 (diff)
Merge commit 'nadir/master'
Diffstat (limited to 'manifests/puppetmaster/package.pp')
-rw-r--r--manifests/puppetmaster/package.pp9
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp
index d7c477d..c91dbe8 100644
--- a/manifests/puppetmaster/package.pp
+++ b/manifests/puppetmaster/package.pp
@@ -1,9 +1,14 @@
# manifests/puppetmaster/package.pp
class puppet::puppetmaster::package inherits puppet::puppetmaster::linux {
- package { puppet-server: ensure => present }
+ case $operatingsystem {
+ debian: { $puppetmaster_package="puppetmaster" }
+ default: { $puppetmaster_package="puppet-server" }
+ }
+
+ package { $puppetmaster_package: ensure => present }
Service[puppetmaster]{
- require +> Package[puppet-server],
+ require +> Package[$puppetmaster_package],
}
}