diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:34:39 -0500 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:38:39 -0500 |
commit | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (patch) | |
tree | acd91c59fea86768f81d98e262ed1677f646fa47 /manifests/debian.pp | |
parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
parent | 8584340c2aeac7d97a78b8303ab377b5049b80c2 (diff) |
Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet
Conflicts:
files/master/config.ru
files/master/puppet.conf
manifests/base.pp
manifests/centos.pp
manifests/cron.pp
manifests/cron/base.pp
manifests/cron/linux.pp
manifests/debian.pp
manifests/init.pp
manifests/linux.pp
manifests/master/linux.pp
manifests/master/package/debian.pp
manifests/puppetmaster/base.pp
manifests/puppetmaster/centos.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/cleanup_reports.pp
manifests/puppetmaster/cleanup_reports/disable.pp
manifests/puppetmaster/debian.pp
manifests/puppetmaster/package.pp
manifests/puppetmaster/package/base.pp
manifests/puppetmaster/passenger.pp
Diffstat (limited to 'manifests/debian.pp')
-rw-r--r-- | manifests/debian.pp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index e24a1bc..2ad54ed 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,33 +1,24 @@ +# debian specific things class puppet::debian inherits puppet::linux { file { '/etc/default/puppet': - source => [ "puppet:///modules/site_puppet/client/debian/${fqdn}/puppet", - "puppet:///modules/site_puppet/client/debian/${domain}/puppet", - "puppet:///modules/site_puppet/client/debian/puppet", - "puppet:///modules/puppet/client/debian/puppet" ], - notify => Service[puppet], - owner => root, group => 0, mode => 0644; - } - - if versioncmp($puppetversion,'2.6') >= 0 { - $real_puppet_hasstatus = true - } - else { - $real_puppet_hasstatus = false - } - - Service[puppet]{ - hasstatus => $real_puppet_hasstatus, + source => ["puppet:///modules/site_puppet/client/debian/${::fqdn}/puppet", + "puppet:///modules/site_puppet/client/debian/${::domain}/puppet", + 'puppet:///modules/site_puppet/client/debian/puppet', + 'puppet:///modules/puppet/client/debian/puppet' ], + notify => Service[puppet], + owner => root, + group => 0, + mode => '0644'; } - if !$puppet_ensure_version { $puppet_ensure_version = 'installed' } package{ 'puppet-common': - ensure => $puppet_ensure_version, + ensure => $puppet::ensure_version, } Package['puppet']{ require => Package['puppet-common'] - } + } } |