summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-26 15:53:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-26 15:53:57 -0300
commiteb7c8f826ddbf7a19578ddc4c2b9205fdd519e31 (patch)
treef04cc8281de4aac1bf286b655a92c0d8df57eae4
parentc844730bdea106d9bda490e71d457dbbf55e129f (diff)
downloadpuppet-puppet-eb7c8f826ddbf7a19578ddc4c2b9205fdd519e31.tar.gz
puppet-puppet-eb7c8f826ddbf7a19578ddc4c2b9205fdd519e31.tar.bz2
Managin /etc/default/puppet
-rw-r--r--files/puppet7
-rw-r--r--manifests/puppetd.pp10
2 files changed, 16 insertions, 1 deletions
diff --git a/files/puppet b/files/puppet
new file mode 100644
index 0000000..d9f5fd4
--- /dev/null
+++ b/files/puppet
@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=yes
+
+# Startup options
+DAEMON_OPTS=""
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 5950433..63ef34e 100644
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -14,11 +14,19 @@ class puppetd inherits puppet {
require => Package["cron"],
}
+ file { "/etc/default/puppet":
+ source => "puppet://$server/modules/puppet/puppet",
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ }
+
service { "puppet":
enable => true,
ensure => running,
hasrestart => true,
- require => Package["puppet"],
+ require => [ Package["puppet"], File["/etc/default/puppet"] ],
}
# default config file for puppet nodes