From 1e5237aaab2ea6bd4e320c66977314756befe5e9 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@redhat.com>
Date: Tue, 25 Oct 2011 17:23:58 +0200
Subject: [PATCH] provide new sysconfig file, rename ldap to slapd

On some places, 'ldap' was used in context with OpenLDAP server, mostly
from historical reasons. This was changed  to 'slapd' where possible
without breaking configuration.
---
 ldap.sysconfig                  | 30 ------------------------------
 slapd.sysconfig                 | 12 ++++++++++++
 ldap.tmpfiles => slapd.tmpfiles |  0
 3 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 ldap.sysconfig
 create mode 100644 slapd.sysconfig
 rename ldap.tmpfiles => slapd.tmpfiles (100%)

diff --git a/ldap.sysconfig b/ldap.sysconfig
deleted file mode 100644
index 7bd51e0..0000000
--- a/ldap.sysconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# Options of slapd (see man slapd)
-#SLAPD_OPTIONS=
-
-# At least one of SLAPD_LDAP, SLAPD_LDAPI and SLAPD_LDAPS must be set to 'yes'!
-#
-# Run slapd with -h "... ldap:/// ..."
-#   yes/no, default: yes
-SLAPD_LDAP=yes
-
-# Run slapd with -h "... ldapi:/// ..."
-#   yes/no, default: yes
-SLAPD_LDAPI=yes
-
-# Run slapd with -h "... ldaps:/// ..."
-#   yes/no, default: no
-SLAPD_LDAPS=no
-
-# Run slapd with -h "... $SLAPD_URLS ..."
-# This option could be used instead of previous three ones, but:
-# - it doesn't overwrite settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
-# - it isn't overwritten by settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
-# example: SLAPD_URLS="ldapi:///var/lib/ldap_root/ldapi ldapi:/// ldaps:///"
-# default: empty
-#SLAPD_URLS=""
-
-# Maximum allowed time to wait for slapd shutdown on 'service ldap stop' (in seconds)
-#SLAPD_SHUTDOWN_TIMEOUT=3
-
-# Parameters to ulimit, use to change system limits for slapd
-#SLAPD_ULIMIT_SETTINGS=""
diff --git a/slapd.sysconfig b/slapd.sysconfig
new file mode 100644
index 0000000..e3e42bb
--- /dev/null
+++ b/slapd.sysconfig
@@ -0,0 +1,12 @@
+# OpenLDAP server configuration
+# see 'man slapd' for additional information
+
+# Where the server will run (-h option)
+# - ldapi:/// is required for on-the-fly configuration using client tools
+#   (use SASL with EXTERNAL mechanism for authentication)
+# - default: ldapi:/// ldap:///
+# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
+SLAPD_URLS="ldapi:/// ldap:///"
+
+# Any custom options
+#SLAPD_OPTIONS=""
diff --git a/ldap.tmpfiles b/slapd.tmpfiles
similarity index 100%
rename from ldap.tmpfiles
rename to slapd.tmpfiles