From 348aa3e26cf363df2e4a8dc1698da520973b2d2b Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Mon, 28 Jan 2008 22:48:12 +1100
Subject: Fixed #1028 - examples incorrect for 0.24.x

---
 examples/root/etc/puppet/puppet.conf        | 10 ++++++++++
 examples/root/etc/puppet/puppetd.conf       |  4 ----
 examples/root/etc/puppet/puppetmasterd.conf |  7 -------
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 examples/root/etc/puppet/puppet.conf
 delete mode 100644 examples/root/etc/puppet/puppetd.conf
 delete mode 100644 examples/root/etc/puppet/puppetmasterd.conf

diff --git a/examples/root/etc/puppet/puppet.conf b/examples/root/etc/puppet/puppet.conf
new file mode 100644
index 000000000..151364ebd
--- /dev/null
+++ b/examples/root/etc/puppet/puppet.conf
@@ -0,0 +1,10 @@
+[puppetd]
+report = true
+factsync = true
+pluginsync = true
+
+[puppetmasterd]
+reports = store,rrdgraph,tagmail,log
+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
diff --git a/examples/root/etc/puppet/puppetmasterd.conf b/examples/root/etc/puppet/puppetmasterd.conf
deleted file mode 100644
index b3182075c..000000000
--- a/examples/root/etc/puppet/puppetmasterd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[puppetmasterd]
-reports = store,rrdgraph,tagmail,log
-
-[ldap]
-ldapnodes = true
-ldapserver = culain.madstop.com
-ldapbase = dc=madstop,dc=com
-- 
cgit