Sorting things better

diff --git a/manifests/puppet.pp b/manifests/puppet.pp
index b783e99f9fbaec1a5392b2bae5faf329d5cf5cdb..8000f47c0ad6ebabbf68cbb886343823b887c3da 100644 (file)
--- 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 d310ab950d443ffa6380f12020efe387d3dfd472..f7dab0f041ac0517c498810714680e94117ca0d5 100644 (file)
--- 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 411f9089adc799103f0ff6f5cebcac30d5981ccf..2b7ace5018a93fbab309469ed97df9d7cbbe0e82 100644 (file)
--- 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 {