Fixed puppet.conf for Puppet 2.6

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``

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