Misc fixes for standalone implementation

diff --git a/manifests/base.pp b/manifests/base.pp
index 299ecc684da84cc09ccd92b351434fda9a0474c6..95b5906a889998171f5b44a92b1f9877c895d249 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,6 +1,7 @@
 # manage puppet package
 class puppet::base(
-  $start_on_boot = false
+  $start_on_boot = false,
+  $ensure        = ''
 ) {
   include puppet
 
@@ -18,11 +19,11 @@ class puppet::base(
   }
 
   file { "/etc/default/puppet":
-    source => "puppet:///modules/puppet/puppet",
-    owner  => "root",
-    group  => "root",
-    mode   => 0644,
-    ensure => present,
+    content => template('puppet/puppet.erb'),
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
   }
 
 }

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 59d83ba8a0268fb984942b5258873633a33ef7c9..61475a40d510bad2366695e616921e9147960b16 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -11,9 +11,7 @@ class puppet::daemon(
     start_on_boot => true
   }
 
-  package { "cron":
-    ensure => installed,
-  }
+  include cron
 
   service { "puppet":
     enable     => true,

diff --git a/files/puppet b/templates/puppet.erb
similarity index 100%
rename from files/puppet
rename to templates/puppet.erb