tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed puppet.conf for Puppet 2.6

Browse source
This commit is contained in:
Ossi Salmi 2011-02-01 16:06:16 +02:00 • committed by Timo Mkinen
parent f72ec5b350
commit 533bd88744
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
puppet/templates/puppet.conf.erb
View file

@ -40,7 +40,11 @@
pluginsignore = .svn CVS RCS pluginsignore = .svn CVS RCS
factpath = $vardir/lib/facter factpath = $vardir/lib/facter
<% if puppetversion[/\d+/].to_i >= 2 -%>
[agent]
<% else -%>
[puppetd] [puppetd]
<% end -%>
# The file in which puppetd stores a list of the classes # The file in which puppetd stores a list of the classes
# associated with the retrieved configuratiion. Can be loaded in # associated with the retrieved configuratiion. Can be loaded in
# the separate ``puppet`` executable using the ``--loadclasses`` # the separate ``puppet`` executable using the ``--loadclasses``

4
puppet/templates/puppetmaster.conf.erb
View file

@ -1,5 +1,9 @@
<% if puppetversion[/\d+/].to_i >= 2 -%>
[master]
<% else -%>
[puppetmasterd] [puppetmasterd]
<% end -%>
# Enable reporting on server. # Enable reporting on server.
reports = tagmail,store,rrdgraph reports = tagmail,store,rrdgraph