From: Howard Chu <hyc@openldap.org>
Date: Sun, 8 May 2005 05:21:54 +0000 (+0000)
Subject: Add notes about -F config dir option
X-Git-Tag: OPENLDAP_AC_BP~697
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48fba4a894c74cc9e17ab33b7b24e37f606827f8;p=openldap

Add notes about -F config dir option
---

diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index fd629920f5..0fa5d7d54c 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -10,6 +10,7 @@ slapd \- Stand-alone LDAP Daemon
 .B [\-T {acl|add|auth|cat|dn|index|passwd|test}]
 .B [\-d debug\-level]
 .B [\-f slapd\-config\-file]
+.B [\-F slapd\-config\-directory]
 .B [\-h URLs]
 .B [\-n service\-name] [\-s syslog\-level] [\-l syslog\-local\-user]
 .B [\-r directory]
@@ -27,8 +28,7 @@ is typically invoked at boot time, usually out of
 Upon startup,
 .B slapd
 normally forks and disassociates itself from the invoking tty.
-If configured in
-.BR ETCDIR/slapd.conf ,
+If configured in the config file (or config directory),
 the
 .B slapd
 process will print its process ID (see
@@ -123,6 +123,20 @@ facility.
 Specifies the slapd configuration file. The default is
 .BR ETCDIR/slapd.conf .
 .TP
+.BI \-F " slapd\-config\-directory"
+Specifies the slapd configuration file. The default is
+.BR ETCDIR/slapd.d .
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, slapd will attempt to read the
+default config directory before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
+.TP
 .BI \-h " URLlist"
 .B slapd
 will by default serve