diff options
| -rw-r--r-- | manifests/cron/base.pp | 3 | ||||
| -rw-r--r-- | manifests/master/debian.pp | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index e012731..82483df 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -2,8 +2,7 @@ class puppet::cron::base inherits puppet::base { case $::operatingsystem { - debian: { if $::lsbdistcodename != 'lenny' { $stop_service = true } else { $stop_service = false } } - openbsd, ubuntu: { $stop_service = false } + openbsd: { $stop_service = false } default: { $stop_service = true } } diff --git a/manifests/master/debian.pp b/manifests/master/debian.pp index f51a319..5748683 100644 --- a/manifests/master/debian.pp +++ b/manifests/master/debian.pp @@ -1,19 +1,18 @@ +# debian master class puppet::master::debian inherits puppet::master::package { if $puppet::master::mode != 'passenger' { - case $::lsbdistcodename { - squeeze,sid: { - Service['puppetmaster'] { hasstatus => true, hasrestart => true } - } - } + Service['puppetmaster'] { hasstatus => true, hasrestart => true } } file { '/etc/default/puppetmaster': - source => [ "puppet:///modules/site_puppet/master/debian/${::fqdn}/puppetmaster", + source => ["puppet:///modules/site_puppet/master/debian/${::fqdn}/puppetmaster", "puppet:///modules/site_puppet/master/debian/${::domain}/puppetmaster", - "puppet:///modules/site_puppet/master/debian/puppetmaster", - "puppet:///modules/puppet/master/debian/puppetmaster" ], - notify => Service[puppetmaster], - owner => root, group => 0, mode => 0644; + 'puppet:///modules/site_puppet/master/debian/puppetmaster', + 'puppet:///modules/puppet/master/debian/puppetmaster' ], + notify => Service[puppetmaster], + owner => root, + group => 0, + mode => '0644'; } } |