From 533bd88744b1f46d9f595b208a1a5f366942479d Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Tue, 1 Feb 2011 16:06:16 +0200 Subject: [PATCH] Fixed puppet.conf for Puppet 2.6 --- puppet/templates/puppet.conf.erb | 4 ++++ puppet/templates/puppetmaster.conf.erb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/puppet/templates/puppet.conf.erb b/puppet/templates/puppet.conf.erb index af64384..3cc1c75 100644 --- a/puppet/templates/puppet.conf.erb +++ b/puppet/templates/puppet.conf.erb @@ -40,7 +40,11 @@ pluginsignore = .svn CVS RCS factpath = $vardir/lib/facter +<% if puppetversion[/\d+/].to_i >= 2 -%> +[agent] +<% else -%> [puppetd] +<% end -%> # The file in which puppetd stores a list of the classes # associated with the retrieved configuratiion. Can be loaded in # the separate ``puppet`` executable using the ``--loadclasses`` diff --git a/puppet/templates/puppetmaster.conf.erb b/puppet/templates/puppetmaster.conf.erb index 226e4f8..9517f4b 100644 --- a/puppet/templates/puppetmaster.conf.erb +++ b/puppet/templates/puppetmaster.conf.erb @@ -1,5 +1,9 @@ +<% if puppetversion[/\d+/].to_i >= 2 -%> +[master] +<% else -%> [puppetmasterd] +<% end -%> # Enable reporting on server. reports = tagmail,store,rrdgraph