From a15d322a91e6c438f65a23b4fe5fb8d63c32def0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Feb 2010 17:44:26 +0100
Subject: Allowes puppet::cron also on the puppetmaster server

---
 manifests/cron/base.pp         | 10 ++++++++--
 manifests/puppetmaster/base.pp | 27 ++++++++++++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'manifests')

diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index 7244e02..5fc55d2 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -4,9 +4,15 @@ class puppet::cron::base inherits puppet::base {
     Service['puppet']{
       enable => false,
     }
-    File['puppet_config']{
-      notify => undef
+
+    if defined (puppet::puppetmaster) {}
+    else {
+	File['puppet_config']{
+	  notify => undef
+	}
     }
+
+
     case $operatingsystem {
       debian,openbsd,ubuntu: {
         #it's already disabled
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index 0b208b0..2305725 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -1,9 +1,18 @@
 class puppet::puppetmaster::base inherits puppet::base {
+    if defined (puppet::cron) { 
+	File[puppet_config]{
+	    source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
+			"puppet://$server/modules/puppet/master/puppet.conf" ],
+	    notify => Service[puppetmaster],
+	}
+    }
+    else {
+	File[puppet_config]{
+	    source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
+			"puppet://$server/modules/puppet/master/puppet.conf" ],
+	    notify => [Service[puppet],Service[puppetmaster] ],
+	}
 
-    File[puppet_config]{
-        source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
-                    "puppet://$server/modules/puppet/master/puppet.conf" ],
-        notify => [Service[puppet],Service[puppetmaster] ],
     }
 
     $real_puppet_fileserverconfig = $puppet_fileserverconfig ? {
@@ -12,12 +21,12 @@ class puppet::puppetmaster::base inherits puppet::base {
     }
 
     file { "$real_puppet_fileserverconfig":
-        source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf",
-                    "puppet://$server/modules/site-puppet/master/fileserver.conf",
-                    "puppet://$server/modules/puppet/master/fileserver.conf" ],
-        notify => [Service[puppet],Service[puppetmaster] ],
+	 source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf",
+	 	     "puppet://$server/modules/site-puppet/master/fileserver.conf",
+	 	     "puppet://$server/modules/puppet/master/fileserver.conf" ],
+	 notify => [Service[puppet],Service[puppetmaster] ],
         owner => root, group => puppet, mode => 640;
-    }
+   } 
 
     if $puppetmaster_storeconfigs {
         include puppet::puppetmaster::storeconfigs
-- 
cgit v1.2.3