From 4e54f3c56d7ed2e5cc9d9f547c6e3dc4cfa1b9a4 Mon Sep 17 00:00:00 2001 From: Gavin Henry Date: Mon, 8 Jun 2009 15:25:42 +0000 Subject: [PATCH] ITS#6060 Admin guide doesn't describe converting from slapd.conf to cn=config --- doc/guide/admin/access-control.sdf | 2 +- doc/guide/admin/slapdconf2.sdf | 37 ++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/doc/guide/admin/access-control.sdf b/doc/guide/admin/access-control.sdf index 610467e71b..9de4b1c0f2 100644 --- a/doc/guide/admin/access-control.sdf +++ b/doc/guide/admin/access-control.sdf @@ -988,7 +988,7 @@ E: 52. olcAccess: to * by users read H3: Converting from {{slapd.conf}}(5) to a {{B:cn=config}} directory format -Discuss slap* -f slapd.conf -F slapd.d/ (man slapd-config) +See the related section in {{SECT:Configuring slapd}}. H2: Access Control Common Examples diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf index 292026cb29..cbf4df4aaa 100644 --- a/doc/guide/admin/slapdconf2.sdf +++ b/doc/guide/admin/slapdconf2.sdf @@ -5,34 +5,51 @@ H1: Configuring slapd Once the software has been built and installed, you are ready -to configure {{slapd}}(8) for use at your site. Unlike previous +to configure {{slapd}}(8) for use at your site. + +Unlike previous OpenLDAP releases, the slapd(8) runtime configuration in 2.3 (and later) is fully LDAP-enabled and can be managed using the standard LDAP operations with data in {{TERM:LDIF}}. The LDAP configuration engine allows all of slapd's configuration options to be changed on the fly, generally without requiring a server restart for the changes -to take effect. The old style {{slapd.conf}}(5) file is still +to take effect. + +The old style {{slapd.conf}}(5) file is still supported, but must be converted to the new {{slapd-config}}(5) format to allow runtime changes to be saved. While the old style configuration uses a single file, normally installed as {{F:/usr/local/etc/openldap/slapd.conf}}, the new style uses a slapd backend database to store the configuration. The configuration database normally resides in the -{{F:/usr/local/etc/openldap/slapd.d}} directory. When -converting from the slapd.conf format to slapd.d format, any -include files will also be integrated into the resulting configuration -database. +{{F:/usr/local/etc/openldap/slapd.d}} directory. An alternate configuration +directory (or file) can be specified via a command-line option to +{{slapd}}(8). -An alternate configuration directory (or file) can be specified via -a command-line option to {{slapd}}(8). This chapter describes the -general format of the configuration system, followed by a detailed -description of commonly used config settings. +This chapter briefly discusses converting to the new style configuration, +then describes the general format of the configuration system, followed by +a detailed description of commonly used config settings. Note: some of the backends and of the distributed overlays do not support runtime configuration yet. In those cases, the old style {{slapd.conf}}(5) file must be used. +H2: Converting old style {{slapd.conf}}(5) file to {{cn=config}} format + +An existing {{slapd.conf}}(5) file can be converted to the new format using +{{slaptest}}(8) or any of the slap tools: + +> slaptest -f /usr/local/etc/openldap/slapd.conf -F /usr/local/etc/openldap/slapd.d + +You can then discard the old {{slapd.conf}}(5) file. Make sure to launch +{{slapd}}(8) with the {{-F}} option to specify the configuration directory. + +Note: When converting from the slapd.conf format to slapd.d format, any +included files will also be integrated into the resulting configuration +database. + + H2: Configuration Layout The slapd configuration is stored as a special LDAP directory with -- 2.39.5