Improve text and HTML.

diff --git a/blog/draft/2010-07-03-ldap-searches.txt b/blog/draft/2010-07-03-ldap-searches.txt
index 554027a7abe6d67247844e07c178a481e5655db2..4a6b450e0f8ca101bb856c73172fcae7f03aa81c 100644 (file)
--- a/blog/draft/2010-07-03-ldap-searches.txt
+++ b/blog/draft/2010-07-03-ldap-searches.txt
@@ -1,6 +1,6 @@
 Title: What are they searching for - PowerDNS and ISC DHCP in LDAP
 Tags: english, debian, debian edu, nuug, ldap
 Title: What are they searching for - PowerDNS and ISC DHCP in LDAP
 Tags: english, debian, debian edu, nuug, ldap

-Date: 2010-07-17 20:00
+Date: 2010-07-17 21:00

 
 <p>This is a
 <a href="http://people.skolelinux.org/pere/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html">followup</a>
 
 <p>This is a
 <a href="http://people.skolelinux.org/pere/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html">followup</a>


@@ -272,12 +272,15 @@ 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
 structure.</p>
 
 <p>Based on the observed behaviour, I suspect a LDAP structure like

-this might work:
+this might work:</p>

 
 <blockquote><pre>
 ou=services
   cn=dns-and-dhcp (dhcpService) - dhcpServiceDN points here
     cn=dhcp (dhcpServer)
 
 <blockquote><pre>
 ou=services
   cn=dns-and-dhcp (dhcpService) - dhcpServiceDN points here
     cn=dhcp (dhcpServer)

+    cn=dhcp-internal (dhcpSharedNetwork/dhcpOptions)
+      cn=10.0.2.0 (dhcpSubnet)
+        cn=group1 (dhcpGroup/dhcpOptions)

     cn=dhcp-thinclients (dhcpSharedNetwork/dhcpOptions)
       cn=192.168.0.0 (dhcpSubnet)
         cn=group1 (dhcpGroup/dhcpOptions)
     cn=dhcp-thinclients (dhcpSharedNetwork/dhcpOptions)
       cn=192.168.0.0 (dhcpSubnet)
         cn=group1 (dhcpGroup/dhcpOptions)


@@ -285,8 +288,13 @@ ou=services
       cn=hostname (dhcpHost/domainrelatedobject/dnsDomainAux)
 </pre></blockquote>
 
       cn=hostname (dhcpHost/domainrelatedobject/dnsDomainAux)
 </pre></blockquote>
 

+<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>
+

 <p>The combined object under the machines subtree would look something
 <p>The combined object under the machines subtree would look something

-like this:
+like this:</p>

     
 <blockquote><pre>
 dn: dc=hostname,ou=machines,cn=dns-and-dhcp,dc=skole,dc=skolelinux,dc=no
     
 <blockquote><pre>
 dn: dc=hostname,ou=machines,cn=dns-and-dhcp,dc=skole,dc=skolelinux,dc=no