[Pkg-openldap-devel] [openldap] 02/06: r413 at pulsar: torsten | 2005-02-25 14:34:51 +0100 Merged some changes done by Fabio M. Di Nitto for the ubuntu distribution (thanks, Fabio!): + debian/slapd.{postinst, conf}: Checkpoint BDB databases every 512kb or 30 minutes by default. + debian/slapd.scripts-common: Make is_empty_dir less noisy on first install (cosmetic).

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-0.pre2
in repository openldap.

commit b2b7d3dfe03348f8f103e23fb49b8576ecb30902
Author: Torsten Landschoff <torsten at debian.org>
Date:   Fri Feb 25 13:47:33 2005 +0000

     r413 at pulsar:  torsten | 2005-02-25 14:34:51 +0100
     Merged some changes done by Fabio M. Di Nitto for the ubuntu
     distribution (thanks, Fabio!):
     + debian/slapd.{postinst,conf}: Checkpoint BDB databases every 512kb
       or 30 minutes by default.
     + debian/slapd.scripts-common: Make is_empty_dir less noisy on first
       install (cosmetic).
---
 debian/changelog            |    6 ++++++
 debian/slapd.conf           |    1 +
 debian/slapd.postinst       |    6 ++++++
 debian/slapd.scripts-common |    2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 476028b..cc08f80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ openldap2.2 (2.2.23-0.pre2) experimental; urgency=low
 
   * servers/slurpd/slurp.h: Relocate the default spool directory to 
     /var/spool/slurpd again.
+  * Merged some changes done by Fabio M. Di Nitto for the ubuntu 
+    distribution (thanks, Fabio!):
+    + debian/slapd.{postinst,conf}: Checkpoint BDB databases every 512kb
+      or 30 minutes by default.
+    + debian/slapd.scripts-common: Make is_empty_dir less noisy on first
+      install (cosmetic).
 
  -- 
 
diff --git a/debian/slapd.conf b/debian/slapd.conf
index 62311e2..c0d801f 100644
--- a/debian/slapd.conf
+++ b/debian/slapd.conf
@@ -36,6 +36,7 @@ moduleload	back_ at BACKEND@
 # Backend specific directives apply to this backend until another
 # 'backend' directive occurs
 backend		@BACKEND@
+ at CHECKPOINT@
 
 #######################################################################
 # Specific Backend Directives for 'other':
diff --git a/debian/slapd.postinst b/debian/slapd.postinst
index 611f827..61b4781 100644
--- a/debian/slapd.postinst
+++ b/debian/slapd.postinst
@@ -63,10 +63,16 @@ create_new_configuration() {
 create_new_slapd_conf() {
   basedn=$1
   backend=$2
+  checkpoint=""
+
+  if [ "$backend" = "bdb" ]; then
+    checkpoint="checkpoint 512 30"
+  fi
 
   TMPFILE=`mktemp -q ${SLAPD_CONF}.XXXXXX`
   echo -n "Creating initial slapd configuration... "
   sed -e "s/@SUFFIX@/$basedn/g" -e "s/@ADMIN@/cn=admin,$basedn/g" \
+      -e "s/@CHECKPOINT@/$checkpoint/g" \
       -e "s/@BACKEND@/$backend/g" </usr/share/slapd/slapd.conf >$TMPFILE
   mv $TMPFILE $SLAPD_CONF
   echo "done"
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index f842b27..1d90c7d 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -171,7 +171,7 @@ create_ldif_dump_location() {
 
 # Check if a path refers to an empty directory
 is_empty_dir() {
-  output=`find "$1" -type d -maxdepth 0 -empty`
+  output=`find "$1" -type d -maxdepth 0 -empty 2>/dev/null`
   if [ -n "$output" ]; then
     return 0
   else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git