aboutsummaryrefslogtreecommitdiffstats
path: root/modules/puppet/templates
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-05 18:34:23 +0000
committerMichael Scherer <misc@mageia.org>2010-11-05 18:34:23 +0000
commitaf9351740773d909ec8f716f97dcb3372171ed4d (patch)
tree9251a2a9a03047af15ed1797e8e8b2231e57ab86 /modules/puppet/templates
parentda56f5a42823f213ab332487c3291f334a54ddc8 (diff)
downloadpuppet-af9351740773d909ec8f716f97dcb3372171ed4d.tar
puppet-af9351740773d909ec8f716f97dcb3372171ed4d.tar.gz
puppet-af9351740773d909ec8f716f97dcb3372171ed4d.tar.bz2
puppet-af9351740773d909ec8f716f97dcb3372171ed4d.tar.xz
puppet-af9351740773d909ec8f716f97dcb3372171ed4d.zip
- migrate to the new config file format
Diffstat (limited to 'modules/puppet/templates')
-rw-r--r--modules/puppet/templates/puppet.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf
index a1a9c78b..9fb184c1 100644
--- a/modules/puppet/templates/puppet.conf
+++ b/modules/puppet/templates/puppet.conf
@@ -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