directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r836743 - in /websites/staging/directory/trunk/content: ./ apacheds/basic-ug/2.2.2-more-search-options.html apacheds/basic-ug/3.2-basic-authorization.html apacheds/basic-ug/3.3-enabling-ssl.html
Date Wed, 31 Oct 2012 15:30:01 GMT
Author: buildbot
Date: Wed Oct 31 15:30:00 2012
New Revision: 836743

Log:
Staging update by buildbot for directory

Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/3.2-basic-authorization.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 31 15:30:00 2012
@@ -1 +1 @@
-1404192
+1404205

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
(original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
Wed Oct 31 15:30:00 2012
@@ -135,65 +135,63 @@
 <p>The <strong>LDAP</strong> filters can be quite complex. Although they
aren't even close to what <strong>SQL</strong> provide : there is no way you can
do a Join on a LDAP server.</p>
 <p>A filter is a set of nodes connected with operators like <strong>and</strong>,
<strong>or</strong>, <strong>not</strong>...</p>
 <p>Here is the list of possible connectors :</p>
-<div class="table-wrap">
-    <table class="confluenceTable">
-        <tbody>
-            <tr>
-                <th class="confluenceTh"> Connector </th>
-                <th class="confluenceTh"> Description </th>
-                <th class="confluenceTh"> Example </th>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> And </td>
-                <td class="confluenceTd">  All the nodes should be evaluated to true
</td>
-                <td class="confluenceTd"> (&(objectClass=person)(cn=acme)) </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> Or </td>
-                <td class="confluenceTd"> At least one of the node should be evaluated
to true</td>
-                <td class="confluenceTd"> (|(objectClass=person)(cn=acme)) </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> Not </td>
-                <td class="confluenceTd"> select the entries that does not evaluate
to true for this filter </td>
-                <td class="confluenceTd"> (!(objectClass=person))</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
+<table>
+<thead>
+<tr>
+<th align="center">Connector</th>
+<th>Description</th>
+<th align="center">Example</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center">And</td>
+<td>All the nodes should be evaluated to true</td>
+<td align="center">(&amp;(objectClass=person)(cn=acme))</td>
+</tr>
+<tr>
+<td align="center">Or</td>
+<td>At least one of the node should be evaluated to true</td>
+<td align="center">(&#124;(objectClass=person)(cn=acme))</td>
+</tr>
+<tr>
+<td align="center">Not</td>
+<td>Select the entries that does not evaluate to true for this filter</td>
+<td align="center">(!(objectClass=person))</td>
+</tr>
+</tbody>
+</table>
 <p>Each node proceeds a check on the attributeType and value provided in the filter.
For instance, the <strong>"(o=sevenseas)"</strong> filter tells the server to
look for all teh entries whcih have an "organization" atribute with a value of <strong>"sevenseas"</strong>.
Here are the various kind of filters you can use :</p>
-<div class="table-wrap">
-    <table class="confluenceTable">
-        <tbody>
-            <tr>
-                <th class="confluenceTh">Filter</th>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> = (Equality)</td>
-            </tr>
-            <tr>
-                <td class="confluenceTd">Substring</td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> &gt;= </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> &lt;= </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> =* (Present) </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> ~= (ApproxMatch)</td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> extensibleMatch </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
+<table>
+<thead>
+<tr>
+<th align="center">Filter</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center">= (Equality)</td>
+</tr>
+<tr>
+<td align="center">Substring</td>
+</tr>
+<tr>
+<td align="center">&gt;=</td>
+</tr>
+<tr>
+<td align="center">&lt;=</td>
+</tr>
+<tr>
+<td align="center">=* (Present)</td>
+</tr>
+<tr>
+<td align="center">~= (ApproxMatch)</td>
+</tr>
+<tr>
+<td align="center">extensibleMatch</td>
+</tr>
+</tbody>
+</table>
 <h2 id="scope">Scope</h2>
 <p>A Search can span across the whole <strong>DIT</strong>, or just a subset
of it. In <strong>LDAP</strong>, you can use three different scopes :</p>
 <ul>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/3.2-basic-authorization.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/3.2-basic-authorization.html
(original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/3.2-basic-authorization.html
Wed Oct 31 15:30:00 2012
@@ -266,7 +266,7 @@
 </ul>
 <h3 id="enable-the-aci-subsystem">Enable the ACI Subsystem</h3>
 <p>The authorization (ACI) subsystem is disabled by default. You have to enable it
using the <em>Apache Directory Studio</em> configuration editor :</p>
-<p>![Enable access control)(enable-access-control.png)]</p>
+<p><img alt="Enable access control" src="images/enable-access-control.png" /></p>
 <p>A restart of the server is necessary for this change to take effect. </p>
 <h3 id="further-configuration-tasks-to-perform-afterwards">Further configuration tasks
to perform afterwards</h3>
 <ol>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/3.3-enabling-ssl.html Wed Oct
31 15:30:00 2012
@@ -185,53 +185,52 @@ In order to keep it simple for beginners
 <p>We will do it the last way (self-signed), primarily because it's easy and fast (you
won't have to pay nor to wait to obtain your certificate)</p>
 <h4 id="key-creation">Key creation</h4>
 <p>First it is necessary to create a key pair (public/private key) for your server,
<em>zanzibar</em> in our case.  One option is to use the JDK tool <em>keytool</em>
for this task. In the following example, we use these options</p>
-<div class="table-wrap">
-    <table class="confluenceTable">
-        <tbody>
-            <tr>
-                <th class="confluenceTh"> Option </th>
-                <th class="confluenceTh"> value </th>
-                <th class="confluenceTh"> Description </th>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -genkey </td>
-                <td class="confluenceTd">&nbsp;</td>
-                <td class="confluenceTd"> command to generate a key pair </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -keyalg </td>
-                <td class="confluenceTd"> "RSA" </td>
-                <td class="confluenceTd"> algorithm to be used to generate the key
pair,  in our case, default is "DSA" </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -dname </td>
-                <td class="confluenceTd"> "cn=zanzibar, ou=ApacheDS, o=ASF, c=US" </td>
-                <td class="confluenceTd"> the X.500 Distinguished Name to be associated
with alias, used as the issuer and subject fields in the self-signed certificate </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -alias </td>
-                <td class="confluenceTd"> zanzibar </td>
-                <td class="confluenceTd"> name to refer the entry within the keystore
 </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -keystore </td>
-                <td class="confluenceTd"> zanzibar.ks </td>
-                <td class="confluenceTd">  keystore file location </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -storepass </td>
-                <td class="confluenceTd"> secret </td>
-                <td class="confluenceTd">  password used to protect the integrity of
the keystore </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> -validity </td>
-                <td class="confluenceTd"> 730 </td>
-                <td class="confluenceTd"> number of days for which the certificate
should be considered valid, default is 90 </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
+<table>
+<thead>
+<tr>
+<th align="center">Command Option</th>
+<th align="center">Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center">-genkey</td>
+<td align="center">-</td>
+<td>Command to generate a key pair</td>
+</tr>
+<tr>
+<td align="center">-keyalg</td>
+<td align="center">"RSA"</td>
+<td>Algorithm to be used to generate the key pair,  in our case, default is "DSA"</td>
+</tr>
+<tr>
+<td align="center">-dname</td>
+<td align="center">"cn=zanzibar, ou=ApacheDS, o=ASF, c=US"</td>
+<td>The X.500 Distinguished Name to be associated with alias, used as the issuer and
subject fields in the self-signed certificate</td>
+</tr>
+<tr>
+<td align="center">-alias</td>
+<td align="center">zanzibar</td>
+<td>Name to refer the entry within the keystore</td>
+</tr>
+<tr>
+<td align="center">-keystore</td>
+<td align="center">zanzibar.ks</td>
+<td>Keystore file location</td>
+</tr>
+<tr>
+<td align="center">-storepass</td>
+<td align="center">secret</td>
+<td>Password used to protect the integrity of the keystore</td>
+</tr>
+<tr>
+<td align="center">-validity</td>
+<td align="center">730</td>
+<td>Number of days for which the certificate should be considered valid, default is
90</td>
+</tr>
+</tbody>
+</table>
 <p>Learn more about keytool at the <a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html">manpage</a>.</p>
 <div class="codehilite"><pre><span class="nv">$</span> <span class="nv">keytool</span>
<span class="o">-</span><span class="n">genkey</span> <span class="o">-</span><span
class="n">keyalg</span> <span class="s">&quot;RSA&quot;</span>
<span class="o">-</span><span class="n">dname</span> <span class="s">&quot;cn=zanzibar,
ou=ApacheDS, o=ASF, c=US&quot;</span> <span class="o">\\</span>
     <span class="o">-</span><span class="n">alias</span> <span
class="n">zanzibar</span> <span class="o">-</span><span class="n">keystore</span>
<span class="n">zanzibar</span><span class="o">.</span><span class="n">ks</span>
<span class="o">-</span><span class="n">storepass</span> <span
class="n">secret</span> <span class="o">-</span><span class="n">validity</span>
<span class="mi">730</span>
@@ -260,38 +259,37 @@ In order to keep it simple for beginners
 <p>Enabling SSL in Apache Directory Server and using the key pair created as above
is quite easy. Simply put the keystore file in the <em>conf</em> directory of
ApacheDS, and enable ldaps. Then you just have to setup the configuration using <em>Apache
Directory Studio</em>, feeling the required input boxes, as shown on the following picture
:</p>
 <p><img alt="Keystore Configuration" src="images/keystore-configuration.png" /></p>
 <p>The following properties were used :</p>
-<div class="table-wrap">
-    <table class="confluenceTable">
-        <tbody>
-            <tr>
-                <th class="confluenceTh"> Property</th>
-                <th class="confluenceTh"> default value </th>
-                <th class="confluenceTh"> Description </th>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> keystoreFile </td>
-                <td class="confluenceTd"> none </td>
-                <td class="confluenceTd"> path of the X509 (or JKS) certificate file
for LDAPS </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> certificatePassword </td>
-                <td class="confluenceTd"> changeit</td>
-                <td class="confluenceTd"> password which is used to load the LDAPS
certificate file </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> port </td>
-                <td class="confluenceTd"> 10636 </td>
-                <td class="confluenceTd"> LDAPS TCP/IP port number to listen to </td>
-            </tr>
-            <tr>
-                <td class="confluenceTd"> enableSSL </td>
-                <td class="confluenceTd"> true </td>
-                <td class="confluenceTd"> sets if SSL is enabled or not </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
+<table>
+<thead>
+<tr>
+<th align="center">Property</th>
+<th align="center">Default Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center">keystoreFile</td>
+<td align="center">none</td>
+<td>Path of the X509 (or JKS) certificate file for LDAPS</td>
+</tr>
+<tr>
+<td align="center">certificatePassword</td>
+<td align="center">changeit</td>
+<td>Password which is used to load the LDAPS certificate file</td>
+</tr>
+<tr>
+<td align="center">port</td>
+<td align="center">10636</td>
+<td>LDAPS TCP/IP port number to listen to</td>
+</tr>
+<tr>
+<td align="center">enableSSL</td>
+<td align="center">true</td>
+<td>Sets if SSL is enabled or not</td>
+</tr>
+</tbody>
+</table>
 <p>After modification of the configuration, the server has to be restarted in order
to take effect.</p>
 <h2 id="verification-clients">Verification, Clients</h2>
 <p>After restarting the server, you should have a server offering both ldap and ldaps.
How to verify whether it works?</p>



Mime
View raw message