From: Petter Reinholdtsen <pere@hungry.com>
Date: Sat, 17 Jul 2010 18:56:06 +0000 (+0000)
Subject: Adjust proposal.
X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/commitdiff_plain/fa3b64de18bde71aba8ed89cd9fbc47d938b9a44?hp=a639286f3417da3f97a5a2ae3dab9108234bf112

Adjust proposal.
---

diff --git a/blog/draft/2010-07-03-ldap-searches.txt b/blog/draft/2010-07-03-ldap-searches.txt
index 0e50f0d9c9..8fc166e906 100644
--- a/blog/draft/2010-07-03-ldap-searches.txt
+++ b/blog/draft/2010-07-03-ldap-searches.txt
@@ -273,11 +273,11 @@ really help when the DHCP subtree need to have a fairly fixed
 structure.</p>
 
 <p>Based on the observed behaviour, I suspect a LDAP structure like
-this might work:</p>
+this might work for Debian Edu:</p>
 
 <blockquote><pre>
 ou=services
-  cn=dns-and-dhcp (dhcpService) - dhcpServiceDN points here
+  cn=machine-info (dhcpService) - dhcpServiceDN points here
     cn=dhcp (dhcpServer)
     cn=dhcp-internal (dhcpSharedNetwork/dhcpOptions)
       cn=10.0.2.0 (dhcpSubnet)
@@ -292,13 +292,13 @@ ou=services
 <P>This is not tested yet.  If the DHCP server require the dhcpHost
 entries to be in the dhcpGroup subtrees, the entries can be stored
 there instead of a common machines subtree, and the PowerDNS base
-would have to be moved one level up to the dns-and-dhcp subtree.</p>
+would have to be moved one level up to the machine-info subtree.</p>
 
 <p>The combined object under the machines subtree would look something
 like this:</p>
     
 <blockquote><pre>
-dn: dc=hostname,ou=machines,cn=dns-and-dhcp,dc=skole,dc=skolelinux,dc=no
+dn: dc=hostname,ou=machines,cn=machine-info,dc=skole,dc=skolelinux,dc=no
 dc: hostname
 objectClass: top
 objectClass: dhcpHost