/[adm]/puppet/modules/puppet/templates/puppet.conf
ViewVC logotype

Diff of /puppet/modules/puppet/templates/puppet.conf

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1897 by nanardon, Thu Jul 21 09:30:49 2011 UTC revision 2000 by misc, Mon Sep 12 17:02:34 2011 UTC
# Line 14  Line 14 
14      modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules      modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules
15    
16  [master]  [master]
17      certname = puppetmaster.<%= domain %>      certname = puppet.<%= domain %>
18    
19      # tagmail should be kept last, until this bug is fixed      # tagmail should be kept last, until this bug is fixed
20      # https://projects.puppetlabs.com/issues/5018      # https://projects.puppetlabs.com/issues/5018
# Line 29  Line 29 
29    
30    
31  [agent]  [agent]
32      server = puppetmaster.<%= domain %>      server = puppet.<%= domain %>
33    
34      pluginsync = true      pluginsync = true
35    

Legend:
Removed from v.1897  
changed lines
  Added in v.2000

  ViewVC Help
Powered by ViewVC 1.1.30