2 files changed, 4 insertions, 6 deletions
diff --git a/modules/puppet/manifests/client.pp b/modules/puppet/manifests/client.pp
index 6d920a74..b9141ba1 100644
--- a/modules/puppet/manifests/client.pp
+++ b/modules/puppet/manifests/client.pp
@@ -1,12 +1,6 @@
 class puppet::client inherits puppet {
     include puppet::stored_config
 
-    package { 'puppet': }
-
-    File['/etc/puppet/puppet.conf'] {
-        content => template('puppet/puppet.conf','puppet/puppet.agent.conf'),
-    }
-
     cron { 'puppet':
         ensure  => present,
         command => '/usr/sbin/puppetd -o --no-daemonize -l syslog >/dev/null 2>&1',
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp
index 38c74bd2..2cb67856 100644
--- a/modules/puppet/manifests/init.pp
+++ b/modules/puppet/manifests/init.pp
@@ -1,6 +1,10 @@
 class puppet {
+
+    package { 'puppet': }
+
     # only here to be subclassed
     file { '/etc/puppet/puppet.conf':
         require => Package[puppet],
+        content => template('puppet/puppet.conf','puppet/puppet.agent.conf'),
     }
 }