summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetd.pp6
-rw-r--r--templates/puppet-node.conf.erb2
2 files changed, 7 insertions, 1 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 0cd7434..090aeaa 100644
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -30,6 +30,12 @@ class puppetd inherits puppet {
require => [ Package["puppet"], File["/etc/default/puppet"] ],
}
+ # name of puppet agent section in config file
+ $puppet_agent_section = $lsbdistcodename ? {
+ 'lenny','lucid' => 'puppetd',
+ default => 'agent',
+ }
+
# default config file for puppet nodes
if ($puppetmasterd_present != true) or ($main_master != true) {
file { "/etc/puppet/puppet.conf":
diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index 0a1943c..033c2e5 100644
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -6,7 +6,7 @@ rundir = /var/run/puppet
factpath = $vardir/lib/facter
pluginsync = true
-[agent]
+[<%= puppet_agent_section %>]
vardir = /var/lib/puppet
ssldir = $vardir/ssl
server = puppet.<%= domain %>