From 9bc51a55045a80bc9d8917c67f6cb70f4e7ff6f2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Aug 2014 13:46:47 -0300
Subject: Misc fixes for standalone implementation

---
 files/puppet         |  7 -------
 manifests/base.pp    | 13 +++++++------
 manifests/daemon.pp  |  4 +---
 templates/puppet.erb |  7 +++++++
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 files/puppet
 create mode 100644 templates/puppet.erb

diff --git a/files/puppet b/files/puppet
deleted file mode 100644
index 3b85c50..0000000
--- a/files/puppet
+++ /dev/null
@@ -1,7 +0,0 @@
-# Defaults for puppet - sourced by /etc/init.d/puppet
-
-# Start puppet on boot?
-START=<?= start_on_boot ? "yes" : "no" ?>
-
-# Startup options
-DAEMON_OPTS=""
diff --git a/manifests/base.pp b/manifests/base.pp
index 299ecc6..95b5906 100644
--- 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 59d83ba..61475a4 100644
--- 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/templates/puppet.erb b/templates/puppet.erb
new file mode 100644
index 0000000..3b85c50
--- /dev/null
+++ b/templates/puppet.erb
@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=<?= start_on_boot ? "yes" : "no" ?>
+
+# Startup options
+DAEMON_OPTS=""
-- 
cgit v1.2.3