summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppet.pp17
-rw-r--r--manifests/puppetd.pp17
-rw-r--r--manifests/puppetmasterd.pp2
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 {