From 335e77a7ad3dcdb1785d6f0567cc1936b9d925c2 Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Tue, 27 Oct 2020 09:31:19 +0100
Subject: [PATCH] ADS screenshot connection configuration
---
Doc/DbDevel/dbDevel.xml | 125 ++++++++++++++++++++++++++++++++-------
Doc/Templates/resize.txt | 2 +-
2 files changed, 106 insertions(+), 21 deletions(-)
diff --git a/Doc/DbDevel/dbDevel.xml b/Doc/DbDevel/dbDevel.xml
index eddffaa34..ada9a3141 100644
--- a/Doc/DbDevel/dbDevel.xml
+++ b/Doc/DbDevel/dbDevel.xml
@@ -250,32 +250,35 @@ print(fivestar)</programlisting></td>
<figure xml:id="dbDevel_selectedDbOverview_ldap_fig_docker">
<title>Running a Docker container</title>
- <screen>docker run --detach \ <co
+ <screen>docker run --detach <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-1"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-1-co"/>
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-1-co"/> \
+ --name openldap <co
+ linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2.2"
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2.2-co"/>\
-p 389:389 \ <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2"
xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2-co"/>
--env LDAP_ORGANISATION="Betrayers heaven" \ <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-3"
xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-3-co"/>
- --env LDAP_TLS=false \ <co
+ --env LDAP_TLS=false <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-4"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-4-co"/>
- --env LDAP_DOMAIN="betrayer.com" \ <co
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-4-co"/>\
+ --env LDAP_DOMAIN="betrayer.com" <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-5"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-5-co"/>
- --env LDAP_ADMIN_PASSWORD="password" \ <co
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-5-co"/>\
+ --env LDAP_ADMIN_PASSWORD="secret" <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-6"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-6-co"/>
- --env LDAP_CONFIG_PASSWORD="configPassword" \ <co
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-6-co"/>\
+ --env LDAP_CONFIG_PASSWORD="secret" <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-7"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-7-co"/>
- --volume ~/OpenLdap/Data:/var/lib/ldap \ <co
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-7-co"/>\
+ --volume ~/OpenLdap/Data:/var/lib/ldap <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8"
- xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8-co"/>
- --volume ~/OpenLdap/Config:/etc/ldap/slapd.d \ <coref
- linkend="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8-co"/>
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8-co"/>\
+ --volume ~/OpenLdap/Config:/etc/ldap/slapd.d <coref
+ linkend="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8-co"/>\
osixia/openldap:1.4.0 <co
linkends="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-9"
xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-9-co"/></screen>
@@ -287,6 +290,18 @@ osixia/openldap:1.4.0 <co
shell. This will start a background process.</para>
</callout>
+ <callout arearefs="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2.2-co"
+ xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2.2">
+ <para>The container's name to appear <abbrev>i.e.</abbrev> in a
+ <xref linkend="glo_Docker"/> listing:</para>
+
+ <screen><command>docker</command> <option>container</option> <option>ls</option>
+
+CONTAINER ID IMAGE ... PORTS NAMES
+e82c438cda24 osixia/openldap:1.4.0 ... 0.0.0.0:389->389/tcp, 636/tcp <emphasis
+ role="red">openldap</emphasis></screen>
+ </callout>
+
<callout arearefs="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2-co"
xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-2">
<para>Bind the containers port 389 to the host system's port
@@ -324,10 +339,37 @@ osixia/openldap:1.4.0 <co
<callout arearefs="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-7-co"
xml:id="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-7">
<para>The server configuration tree's administrator password
- corresponding to the bind <xref linkend="glo_DN"/>
- <code>cn=admin,cn=config</code> granting full access. This
- grants full access to the server's configuration tree starting
- at <code>cn=config</code>.</para>
+ corresponding to an entirely distinct tree starting at
+ <code>cn=config</code>. This tree among with its top level node
+ of objectclass <code>olcGlobal</code> having <xref
+ linkend="glo_RDN"/> <code>cn=config</code> represents the
+ server's configuration including:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Schema classes.</para>
+ </listitem>
+
+ <listitem>
+ <para>Access rules (permissions).</para>
+ </listitem>
+
+ <listitem>
+ <para>Logging configuration.</para>
+ </listitem>
+
+ <listitem>
+ <para>Search index definitions.</para>
+ </listitem>
+
+ <listitem>
+ <para>Database backend parameters.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para><code>LDAP_CONFIG_PASSWORD</code> corresponds to the bind
+ <xref linkend="glo_DN"/> <code>cn=admin,cn=config</code>
+ granting full access to the server's configuration tree.</para>
</callout>
<callout arearefs="dbDevel_selectedDbOverview_ldap_fig_dockerinstall-8-co"
@@ -341,8 +383,8 @@ osixia/openldap:1.4.0 <co
OpenLdap server's back</para>
<para>end databases will reside on the docker host system's file
- system. This allows for <abbrev>e.g.</abbrev> deleting the
- container before upgrading without loosing data.</para>
+ system. This allows for <abbrev>e.g.</abbrev> deleting and
+ restoring the container without loosing data.</para>
<para>This way your local server's database and the server's log
files will exist outside your <xref linkend="glo_Docker"/>
@@ -392,6 +434,29 @@ osixia/openldap:1.4.0 <co
</itemizedlist>
</figure>
+ <figure xml:id="dbDevel_selectedDbOverview_ldap_fig_docker_compose">
+ <title>Using docker-compose</title>
+
+ <programlisting language="yaml">version: '3.7'
+
+services:
+ openldap:
+ image: osixia/openldap:1.4.0
+ container_name: openldap
+ restart: always
+ environment:
+ LDAP_ORGANISATION: "Betrayers heaven"
+ LDAP_TLS: "false"
+ LDAP_DOMAIN: "betrayer.com"
+ LDAP_ADMIN_PASSWORD: "secret"
+ LDAP_CONFIG_PASSWORD: "secret"
+ ports:
+ - 389:389
+ volumes:
+ - ~/OpenLdap/Data:/var/lib/ldap
+ - ~/OpenLdap/Config:/etc/ldap/slapd.d</programlisting>
+ </figure>
+
<figure xml:id="dbDevel_selectedDbOverview_ldap_fig_apacheDirectoryInstall">
<title>Installing Apache Directory Studio</title>
@@ -407,6 +472,26 @@ osixia/openldap:1.4.0 <co
</listitem>
</itemizedlist>
</figure>
+
+ <figure xml:id="dbDevel_selectedDbOverview_ldap_fig_apacheDirectoryConfigureAdminDit">
+ <title>Administrator access to your DIT</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/dbOverview/Ldap/connectDitAdmin.multi.svg"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <figure xml:id="dbDevel_selectedDbOverview_ldap_fig_apacheDirectoryConfigureAdminConfig">
+ <title>Administrator access to your server's configuration</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/dbOverview/Ldap/connectDitAdmin.multi.svg"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
<section xml:id="sect_dbDevel_overview_openLdap_features">
diff --git a/Doc/Templates/resize.txt b/Doc/Templates/resize.txt
index 4bface08e..7d6dd9c0c 100644
--- a/Doc/Templates/resize.txt
+++ b/Doc/Templates/resize.txt
@@ -1,6 +1,6 @@
wmctrl -l
wmctrl -r 'Data Sources and Drivers' -e 0,200,300,1149,470
-
+wmctrl -r 'New LDAP Connection' -e 0,2200,300,1331,550
170,0 75
1149,2 470 +37
--
GitLab