summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-02 13:31:40 +0100
committervarac <varacanero@zeromail.org>2013-01-02 13:31:40 +0100
commitaaf7ffad90958aff6e068c0496bd5f91e8759e4d (patch)
tree5073995d844fe934011893f872f90a3dbdb66c88
parentf3498eb476cc0fdbabe069451bf45a12510160fa (diff)
parent0097eeef0b24a85d6f067bbf5b126d3fa22f1c15 (diff)
Merge branch 'master' of ssh://labs.riseup.net/shared-puppet
-rw-r--r--manifests/debian.pp12
-rw-r--r--manifests/puppetmaster/debian.pp6
2 files changed, 7 insertions, 11 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp
index e0cf4bc..e24a1bc 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -9,13 +9,11 @@ class puppet::debian inherits puppet::linux {
owner => root, group => 0, mode => 0644;
}
- case $lsbdistcodename {
- squeeze,sid: {
- $real_puppet_hasstatus = true
- }
- default: {
- $real_puppet_hasstatus = false
- }
+ if versioncmp($puppetversion,'2.6') >= 0 {
+ $real_puppet_hasstatus = true
+ }
+ else {
+ $real_puppet_hasstatus = false
}
Service[puppet]{
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
index f440ba3..fc24221 100644
--- a/manifests/puppetmaster/debian.pp
+++ b/manifests/puppetmaster/debian.pp
@@ -4,10 +4,8 @@ class puppet::puppetmaster::debian {
include puppet::puppetmaster::linux
if $puppetmaster_mode != 'passenger' {
- case $lsbdistcodename {
- squeeze,sid: {
- Service['puppetmaster'] { hasstatus => true, hasrestart => true }
- }
+ if $puppet_majorversion >= '2.6' {
+ Service['puppetmaster'] { hasstatus => true, hasrestart => true }
}
}