summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/debian.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/puppetmaster/debian.pp')
-rw-r--r--manifests/puppetmaster/debian.pp7
1 files changed, 3 insertions, 4 deletions
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
index fc24221..fbb3716 100644
--- a/manifests/puppetmaster/debian.pp
+++ b/manifests/puppetmaster/debian.pp
@@ -1,10 +1,9 @@
-class puppet::puppetmaster::debian {
+class puppet::puppetmaster::debian inherits puppet::puppetmaster::linux {
include puppet::puppetmaster::package
- include puppet::puppetmaster::linux
-
+
if $puppetmaster_mode != 'passenger' {
- if $puppet_majorversion >= '2.6' {
+ if $puppet::base::puppet_majorversion >= '2.6' {
Service['puppetmaster'] { hasstatus => true, hasrestart => true }
}
}