OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 14-Nov-2003 21:11:12
Branch: HEAD Handle: 2003111420111001
Added files:
openpkg-src/openldap openldap.patch
Modified files:
openpkg-src/openldap fsl.openldap openldap.spec rc.openldap
openpkg-web news.txt
Log:
blindly add optional support for replication service via slurpd(8)
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/openldap/fsl.openldap
1.3 +25 -0 openpkg-src/openldap/openldap.patch
1.88 +1 -1 openpkg-src/openldap/openldap.spec
1.17 +14 -7 openpkg-src/openldap/rc.openldap
1.7402 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/fsl.openldap
============================================================================
$ cvs diff -u -r1.4 -r1.5 fsl.openldap
--- openpkg-src/openldap/fsl.openldap 14 Jul 2003 18:32:34 -0000 1.4
+++ openpkg-src/openldap/fsl.openldap 14 Nov 2003 20:11:11 -0000 1.5
@@ -2,7 +2,7 @@
## fsl.openldap -- OSSP fsl configuration
##
-ident (slap.*)/.+ q{
+ident (slap.*|slurp.*)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r0 -r1.3 openldap.patch
--- /dev/null 2003-11-14 21:11:11.000000000 +0100
+++ openldap.patch 2003-11-14 21:11:12.000000000 +0100
@@ -0,0 +1,25 @@
+Index: servers/slapd/slapd.conf
+--- servers/slapd/slapd.conf.orig 2003-05-25 01:19:14.000000000 +0200
++++ servers/slapd/slapd.conf 2003-11-14 20:27:06.000000000 +0100
+@@ -64,4 +64,21 @@
+ # Mode 700 recommended.
+ directory %LOCALSTATEDIR%/openldap-data
+ # Indices to maintain
++
+ index objectClass eq
++
++#######################################################################
++# replication via slurpd(8)
++#######################################################################
++
++# master server configuration
++#replogfile %LOCALSTATEDIR%/replog
++#replica-pidfile %LOCALSTATEDIR%/slurpd.pid
++#replica host=slave.example.com:389
++# binddn="cn=admin,dc=example,dc=org"
++# bindmethod=simple credentials=secret
++
++# slave server(s) configuration
++#updatedn "cn=admin,dc=example,dc=org"
++#updateref ldap://master.example.org
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.87 -r1.88 openldap.spec
--- openpkg-src/openldap/openldap.spec 13 Oct 2003 09:21:24 -0000 1.87
+++ openpkg-src/openldap/openldap.spec 14 Nov 2003 20:11:11 -0000 1.88
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.1.23
-Release: 20031013
+Release: 20031114
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.16 -r1.17 rc.openldap
--- openpkg-src/openldap/rc.openldap 24 Jul 2003 13:04:41 -0000 1.16
+++ openpkg-src/openldap/rc.openldap 14 Nov 2003 20:11:11 -0000 1.17
@@ -14,16 +14,21 @@
openldap_log_complevel="9"
%common
- openldap_pidfile="@l_prefix@/var/openldap/slapd.pid"
- openldap_signal () {
- [ -f $openldap_pidfile ] && kill -$1 `cat $openldap_pidfile`
+ openldap_slapd_cfgfile="@l_prefix@/etc/openldap/slapd.conf"
+ openldap_slapd_pidfile="@l_prefix@/var/openldap/slapd.pid"
+ openldap_slurpd_pidfile="@l_prefix@/var/openldap/slurpd.pid"
+ openldap_slapd_signal () {
+ [ -f $openldap_slapd_pidfile ] && kill -$1 `cat $openldap_slapd_pidfile`
+ }
+ openldap_slurpd_signal () {
+ [ -f $openldap_slurpd_pidfile ] && kill -$1 `cat $openldap_slurpd_pidfile`
}
%status -u @l_susr@ -o
openldap_usable="unknown"
openldap_active="no"
rcService openldap enable yes && \
- openldap_signal 0 && openldap_active="yes"
+ openldap_slapd_signal 0 && openldap_active="yes"
echo "openldap_enable=\"$openldap_enable\""
echo "openldap_usable=\"$openldap_usable\""
echo "openldap_active=\"$openldap_active\""
@@ -37,11 +42,15 @@
flags="$flags -h $openldap_url"
fi
@l_prefix@/libexec/openldap/slapd $flags
+ if [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ]; then
+ @l_prefix@/libexec/openldap/slurpd
+ fi
%stop -u @l_susr@
rcService openldap enable yes || exit 0
rcService openldap active no && exit 0
- openldap_signal INT
+ openldap_slapd_signal INT
+ openldap_slurpd_signal INT
sleep 2
%restart -u @l_susr@
@@ -51,8 +60,6 @@
%daily -u @l_susr@
rcService openldap enable yes || exit 0
-
- # rotate logfile
shtool rotate -f \
-n ${openldap_log_numfiles} -s ${openldap_log_minsize} -d \
-z ${openldap_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7401 -r1.7402 news.txt
--- openpkg-web/news.txt 14 Nov 2003 12:54:53 -0000 1.7401
+++ openpkg-web/news.txt 14 Nov 2003 20:11:10 -0000 1.7402
@@ -1,3 +1,4 @@
+14-Nov-2003: Upgraded package: P<openldap-2.1.23-20031114>
14-Nov-2003: Upgraded package: P<tsmc-5.1.6.2-20031114>
14-Nov-2003: Upgraded package: P<orbit2-2.9.1-20031114>
14-Nov-2003: Upgraded package: P<ddd-3.3.8-20031114>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
