diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-03 21:19:10 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-03 21:19:10 -0200 |
| commit | 54c9bab15367265262d9b32f1f5e5b3ea0553702 (patch) | |
| tree | 73e852516ce7eb7acbacac9313c0cbf451a4809f /manifests | |
| parent | 2b26da1218014f87d0c7acddf0b9e0105e8121df (diff) | |
| download | puppet-puppet-54c9bab15367265262d9b32f1f5e5b3ea0553702.tar.gz puppet-puppet-54c9bab15367265262d9b32f1f5e5b3ea0553702.tar.bz2 | |
Sorting things better
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppet.pp | 17 | ||||
| -rw-r--r-- | manifests/puppetd.pp | 17 | ||||
| -rw-r--r-- | manifests/puppetmasterd.pp | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/manifests/puppet.pp b/manifests/puppet.pp index b783e99..8000f47 100644 --- a/manifests/puppet.pp +++ b/manifests/puppet.pp @@ -21,21 +21,4 @@ class puppet { recurse => inf, require => User["puppet"], } - - file { "/usr/local/sbin/check-puppetd.sh": - source => "puppet://$server/modules/puppet/check-puppetd.sh", - owner => "puppet", - group => "puppet", - mode => 0755, - ensure => present, - } - - cron { "puppetd-check": - command => "/usr/local/sbin/check-puppetd.sh &> /dev/null", - user => root, - hour => "*/1", - minute => "0", - require => File["/usr/local/sbin/check-puppetd.sh"], - ensure => present, - } } diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp index d310ab9..f7dab0f 100644 --- a/manifests/puppetd.pp +++ b/manifests/puppetd.pp @@ -38,4 +38,21 @@ class puppetd inherits puppet { ensure => absent, require => Service["puppet"], } + + file { "/usr/local/sbin/check-puppetd.sh": + source => "puppet://$server/modules/puppet/check-puppetd.sh", + owner => "puppet", + group => "puppet", + mode => 0755, + ensure => present, + } + + cron { "puppetd-check": + command => "/usr/local/sbin/check-puppetd.sh &> /dev/null", + user => root, + hour => "*/1", + minute => "0", + require => File["/usr/local/sbin/check-puppetd.sh"], + ensure => present, + } } diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp index 411f908..2b7ace5 100644 --- a/manifests/puppetmasterd.pp +++ b/manifests/puppetmasterd.pp @@ -4,7 +4,7 @@ class puppetmasterd { $puppetmasterd_present = true # then include puppet class - include puppet + include puppetd # needed packages package { |