Setting name of puppet agent section in config file

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 0cd7434b7aff589d8525dd37bd02dfec77814656..090aeaa4ccfc0af2d9ce9761d26742c80909c91c 100644 (file)
--- 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 0a1943c079706bffc5f3ec701cfea340edce5720..033c2e507d305e7a74969c861aa17e331ea99af7 100644 (file)
--- 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 %>