From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 24 Jan 2011 13:23:42 +0000 (+0100)
Subject: cannot require puppet package then, tho
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=888c2f00b35eed7db2f38d377be8d69c7320034c;p=mirror%2Fdsa-puppet.git

cannot require puppet package then, tho
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index d3a2187e3..6a16b404f 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -71,14 +71,14 @@ class debian-org {
             source => "puppet:///files/etc/timezone",
             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
         "/etc/puppet/puppet.conf":
-            require => Package["puppet"],
+            # require => Package["puppet"],
             source => "puppet:///files/etc/puppet/puppet.conf"
             ;
         "/etc/default/puppet":
-            require => Package["puppet"],
+            # require => Package["puppet"],
             source => "puppet:///files/etc/default/puppet"
             ;
-       
+
         "/etc/cron.d/dsa-puppet-stuff":
             source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
             require => Package["cron"]