diff options
| -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 |