diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-16 21:26:28 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-16 21:26:28 -0200 |
| commit | 911337e91c6a34d9fca8ba9095b8c3864571cc5b (patch) | |
| tree | 7fc718159f96f4d997e346a21e876ac25e70be64 | |
| parent | 7b164d8ea701baf67b4b7bdf530002c2871ec151 (diff) | |
| download | puppet-puppet-911337e91c6a34d9fca8ba9095b8c3864571cc5b.tar.gz puppet-puppet-911337e91c6a34d9fca8ba9095b8c3864571cc5b.tar.bz2 | |
Setting name of puppet agent section in config file
| -rw-r--r-- | manifests/puppetd.pp | 6 | ||||
| -rw-r--r-- | templates/puppet-node.conf.erb | 2 |
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 %> |