diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-04 23:56:35 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-04 23:56:35 -0600 |
| commit | e96c5f84233b40915f7f7e993e1816f3de0d3ab2 (patch) | |
| tree | b1b9e56efdfbf4c9a81cb56c9692b12da358a242 /examples | |
| parent | ed0c745c0f3b0f277968149ca25c78ce374bd2e4 (diff) | |
| parent | 16df87c419655106b1585b1e443a2050270518e5 (diff) | |
| download | puppet-e96c5f84233b40915f7f7e993e1816f3de0d3ab2.tar.gz puppet-e96c5f84233b40915f7f7e993e1816f3de0d3ab2.tar.xz puppet-e96c5f84233b40915f7f7e993e1816f3de0d3ab2.zip | |
Merge commit 'turnbull/0.24.x' into 0.24.x
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 |