rpms/openldap/F-9 ldap.init, 1.30, 1.31 ldap.sysconfig, 1.2, 1.3 openldap-2.4.6-config.patch, 1.1, 1.2 openldap.spec, 1.126, 1.127
Jan Šafránek
jsafrane at fedoraproject.org
Mon Oct 13 11:31:29 UTC 2008
- Previous message: rpms/Pound/devel .cvsignore, 1.20, 1.21 Pound.spec, 1.26, 1.27 sources, 1.20, 1.21
- Next message: rpms/perl/F-9 perl-5.10.0-PodSimple.patch, NONE, 1.1 perl-5.10.0-Storable.patch, NONE, 1.1 perl.spec, 1.182, 1.183
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jsafrane
Update of /cvs/pkgs/rpms/openldap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10845
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/F-9/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 11:30:59 -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/F-9/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 11:30:59 -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/F-9/openldap-2.4.6-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-config.patch 21 Nov 2007 12:12:15 -0000 1.1
+++ openldap-2.4.6-config.patch 13 Oct 2008 11:30:59 -0000 1.2
@@ -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/F-9/openldap.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- openldap.spec 21 Jul 2008 07:40:11 -0000 1.126
+++ openldap.spec 13 Oct 2008 11:30:59 -0000 1.127
@@ -8,7 +8,7 @@
Summary: The configuration files, libraries, and documentation for OpenLDAP
Name: openldap
Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -606,6 +606,11 @@
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Mon Oct 13 2008 Jan Safranek <jsafranek at redhat.com> 2.4.10-2
+- 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 Jul 21 2008 Jan Safranek <jsafranek at redhat.com> 2.4.10-1
- bump to ver. 2.4.10 to fix #455357 and #455073
- use new upgrade scripts from rawhide
- Previous message: rpms/Pound/devel .cvsignore, 1.20, 1.21 Pound.spec, 1.26, 1.27 sources, 1.20, 1.21
- Next message: rpms/perl/F-9 perl-5.10.0-PodSimple.patch, NONE, 1.1 perl-5.10.0-Storable.patch, NONE, 1.1 perl.spec, 1.182, 1.183
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list