rpms/openldap/devel ldap.init, 1.30, 1.31 ldap.sysconfig, 1.2, 1.3 openldap-2.4.6-config.patch, 1.2, 1.3 openldap.spec, 1.132, 1.133
Jan Šafránek
jsafrane at fedoraproject.org
Mon Oct 13 10:17:01 UTC 2008
Author: jsafrane
Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30507
Modified Files:
ldap.init ldap.sysconfig openldap-2.4.6-config.patch
openldap.spec
Log Message:
- add SLAPD_SHUTDOWN_TIMEOUT to /etc/sysconfig/ldap, allowing admins to set non-default slapd shutdown timeout
- add checkpoint to default slapd.conf file
Resolves: #458679
Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ldap.init 28 Jan 2008 12:12:02 -0000 1.30
+++ ldap.init 13 Oct 2008 10:16:30 -0000 1.31
@@ -30,6 +30,7 @@
SLAPD_LDAP="yes"
SLAPD_LDAPI="no"
SLAPD_LDAPS="no"
+SLAPD_SHUTDOWN_TIMEOUT=3
# OPTIONS, SLAPD_OPTIONS and KTB5_KTNAME are not defined
# Source an auxiliary options file if we have one
@@ -188,7 +189,7 @@
# Stop daemons.
prog=`basename ${slapd}`
echo -n $"Stopping $prog: "
- killproc -p $pidfile ${slapd}
+ killproc -p $pidfile -d $SLAPD_SHUTDOWN_TIMEOUT ${slapd}
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f $lockfile /var/run/slapd.args
echo
Index: ldap.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldap.sysconfig 18 Sep 2007 10:41:07 -0000 1.2
+++ ldap.sysconfig 13 Oct 2008 10:16:30 -0000 1.3
@@ -18,3 +18,6 @@
# Run slapd with -h "... ldaps:/// ..."
# yes/no, default: no
#SLAPD_LDAPS=no
+
+# Maximum allowed time to wait for slapd shutdown on 'service ldap stop' (in seconds)
+#SLAPD_SHUTDOWN_TIMEOUT=3
openldap-2.4.6-config.patch:
Index: openldap-2.4.6-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openldap-2.4.6-config.patch 1 Sep 2008 08:09:50 -0000 1.2
+++ openldap-2.4.6-config.patch 13 Oct 2008 10:16:30 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up openldap-2.4.11/servers/slapd/slapd.conf.patch1 openldap-2.4.11/servers/slapd/slapd.conf
---- openldap-2.4.11/servers/slapd/slapd.conf.patch1 2007-02-13 21:22:22.000000000 +0100
-+++ openldap-2.4.11/servers/slapd/slapd.conf 2008-09-01 09:57:09.000000000 +0200
+diff -up openldap-2.4.11/servers/slapd/slapd.conf.config openldap-2.4.11/servers/slapd/slapd.conf
+--- openldap-2.4.11/servers/slapd/slapd.conf.config 2007-02-13 21:22:22.000000000 +0100
++++ openldap-2.4.11/servers/slapd/slapd.conf 2008-10-09 16:13:52.000000000 +0200
@@ -2,22 +2,57 @@
# See slapd.conf(5) for details on configuration options.
# This file should NOT be world readable.
@@ -67,7 +67,7 @@
# Sample security restrictions
# Require integrity protection (prevent hijacking)
-@@ -47,19 +82,41 @@ argsfile %LOCALSTATEDIR%/run/slapd.args
+@@ -47,19 +82,42 @@ argsfile %LOCALSTATEDIR%/run/slapd.args
# rootdn can always read and write EVERYTHING!
#######################################################################
@@ -77,6 +77,7 @@
database bdb
suffix "dc=my-domain,dc=com"
++checkpoint 1024 15
rootdn "cn=Manager,dc=my-domain,dc=com"
# Cleartext passwords, especially for the rootdn, should
-# be avoid. See slappasswd(8) and slapd.conf(5) for details.
Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- openldap.spec 1 Sep 2008 08:09:50 -0000 1.132
+++ openldap.spec 13 Oct 2008 10:16:30 -0000 1.133
@@ -11,7 +11,7 @@
Summary: The configuration files, libraries, and documentation for OpenLDAP
Name: openldap
Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -603,6 +603,11 @@
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Mon Oct 13 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-3
+- add SLAPD_SHUTDOWN_TIMEOUT to /etc/sysconfig/ldap, allowing admins
+ to set non-default slapd shutdown timeout
+- add checkpoint to default slapd.conf file (#458679)
+
* Mon Sep 1 2008 Jan Safranek <jsafranek at redhat.com> 2.4.11-2
- provide ldif2ldbm functionality for migrationtools
- rediff all patches to get rid of patch fuzz
More information about the fedora-extras-commits
mailing list