diff options
author | Michael Scherer <misc@mageia.org> | 2011-09-12 17:02:34 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2011-09-12 17:02:34 +0000 |
commit | 2939386116e85feaf7798357f2289dc5abbf27ab (patch) | |
tree | fcacfac23b9bf3e4bbb802269009e53cf95bf3a2 /modules | |
parent | 1910e83c958f25860fc51b9edecabb39c17e8e2a (diff) | |
download | puppet-2939386116e85feaf7798357f2289dc5abbf27ab.tar puppet-2939386116e85feaf7798357f2289dc5abbf27ab.tar.gz puppet-2939386116e85feaf7798357f2289dc5abbf27ab.tar.bz2 puppet-2939386116e85feaf7798357f2289dc5abbf27ab.tar.xz puppet-2939386116e85feaf7798357f2289dc5abbf27ab.zip |
call the server puppet rather than puppetmaster, since that's the
default name, and so it ease the deployment of new nodes and vm
Diffstat (limited to 'modules')
-rw-r--r-- | modules/puppet/templates/puppet.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf index baa8cd01..32a41ad8 100644 --- a/modules/puppet/templates/puppet.conf +++ b/modules/puppet/templates/puppet.conf @@ -14,7 +14,7 @@ modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules [master] - certname = puppetmaster.<%= domain %> + certname = puppet.<%= domain %> # tagmail should be kept last, until this bug is fixed # https://projects.puppetlabs.com/issues/5018 @@ -29,7 +29,7 @@ [agent] - server = puppetmaster.<%= domain %> + server = puppet.<%= domain %> pluginsync = true |