Modified: puppet/modules/puppet/templates/puppet.conf
===================================================================
--- puppet/modules/puppet/templates/puppet.conf 2010-11-05 18:32:45 UTC (rev 163)
+++ puppet/modules/puppet/templates/puppet.conf 2010-11-05 18:34:23 UTC (rev 164)
@@ -11,10 +11,10 @@
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl
-[puppetmasterd]
+[master]
certname = puppetmaster.<%= domain %>
-[puppetd]
+[agent]
server = puppetmaster.<%= domain %>
# The file in which puppetd stores a list of the classes