X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=html%2Fdoc-mail.wml;h=55eea47dddf1fd9a0b0e981b7acaeb347fdbd1ad;hb=2b11596de06303377317c318098bfcf902ee19ec;hp=e7119896ab233c9fc291f482ce8ff50d1fdf4eca;hpb=613c432ec18ad7556fe5f649347f4e7b0cb19fd2;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index e711989..55eea47 100644
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -1,4 +1,7 @@
 #use wml::db.d.o title="LDAP Gateway"
+#use wml::vbar
+
+<dsatoc/>
 
 <p>
 The LDAP directory has a PGP secured mail gateway that
@@ -108,19 +111,45 @@ which will set the authentication key to the identity you are using.
 
 Multiple keys per user are supported, but they must all be sent at once.
 
+Keys can be exported to a subset of machines by prepending
+<b>allowed_hosts=$fqdn,$fqdn2</b> to the specific key. The allowed machines
+must only be separated by a comma.
+
+<i>Example:</i>
+<pre>
+# cat .ssh/debian-machines.pub
+allowed_hosts=ravel.debian.org,gluck.debian.org ssh-rsa AAAAB3Nz..mOX/JQ== user@machine
+ssh-rsa AAAAB3Nz..uD0khQ== user@machine
+</pre>
+
 <li>RBL, RHSBL, and whitelists can only be updated via the mail gateway.  Like
 DNS and ssh keys, any list specified must be specified in its enterity.  The format is:
 <b>listtype</b> <b>dns.domain.of.rbl/IP to whitelist</b> where listtype is one of mailRBL,
 mailRHSBL, and mailWhitelist
 
-<li>Debian.net DNS Zone Entry. The only way to get a debian.net address is
-to use the mail gateway. It
-will verify the request and prevent name collisions automatically. Requests
-can take three forms: <tt>'foo in a 1.2.3.4'</tt>, <tt>'foo in cname
-foo.bar.'</tt>, or <tt>'foo in mx 10 foo.bar.'</tt> (note the trailing dot).
-Note that you
-cannot combine CNAME with any other record types. The precise form
-is critical and must not be deviated from.
+<li>The only way to get a dnsZoneEntry record for a debian.net address is to
+use the mail gateway. It will verify the request and prevent name collisions
+automatically. Requests can take several forms:
+  <dl>
+    <dt><tt>foo in a 192.0.2.123</tt></dt>
+    <dd>to create an A record for <tt>foo.debian.net</tt></dd>
+
+    <dt><tt>foo in aaaa 2001:DB8::12:34</tt></dt>
+    <dd>to create an AAAA record for <tt>foo.debian.net</tt></dd>
+
+    <dt><tt>foo in cname example.org.</tt></dt>
+    <dd>to create a CNAME record for <tt>foo.debian.net</tt></dd>
+
+    <dt><tt>'foo in txt plain text here'</tt></dt>
+    <dd>to create a TXT record for <tt>foo.debian.net</tt></dd>
+
+    <dt><tt>foo in mx 10 example.org.</tt></dt>
+    <dd>to create an MX record for <tt>foo.debian.net</tt></dd>
+  </dl>
+
+Please note the trailing dot for the CNAME and MX records.
+Note that you cannot combine CNAME with any other record types.
+The precise form is critical and must not be deviated from.
 Like the SSH function above, multiple hosts are supported, but they must all
 be sent at once. The debian.net zone is reloaded hourly.