diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-12 17:37:51 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-12 17:37:51 -0600 |
| commit | da78d96cb139db0775e634b2fa4bd9c173752127 (patch) | |
| tree | 4139d3a2011baedb171a8307c4830c5ac3fe3625 /examples | |
| parent | bee9aba2da453151a80c6e1f25f16bec3bfde8d2 (diff) | |
| parent | 3af6827875f4e02b47fe2293280ff9afe811485f (diff) | |
| download | puppet-da78d96cb139db0775e634b2fa4bd9c173752127.tar.gz puppet-da78d96cb139db0775e634b2fa4bd9c173752127.tar.xz puppet-da78d96cb139db0775e634b2fa4bd9c173752127.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/root/etc/puppet/puppet.conf (renamed from examples/root/etc/puppet/puppetmasterd.conf) | 9 | ||||
| -rw-r--r-- | examples/root/etc/puppet/puppetd.conf | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/examples/root/etc/puppet/puppetmasterd.conf b/examples/root/etc/puppet/puppet.conf index b3182075c..151364ebd 100644 --- a/examples/root/etc/puppet/puppetmasterd.conf +++ b/examples/root/etc/puppet/puppet.conf @@ -1,7 +1,10 @@ +[puppetd] +report = true +factsync = true +pluginsync = true + [puppetmasterd] reports = store,rrdgraph,tagmail,log - -[ldap] -ldapnodes = true +node_terminus = ldap ldapserver = culain.madstop.com ldapbase = dc=madstop,dc=com diff --git a/examples/root/etc/puppet/puppetd.conf b/examples/root/etc/puppet/puppetd.conf deleted file mode 100644 index ce988cfa1..000000000 --- a/examples/root/etc/puppet/puppetd.conf +++ /dev/null @@ -1,4 +0,0 @@ -[puppet] -report = true -factsync = true -pluginsync = true |