Masato Taruishi
taru****@users*****
2004年 4月 5日 (月) 20:39:43 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ultrapossum/module/server/00server 2004/04/02 02:48:38 1.19
+++ ultrapossum/module/server/00server 2004/04/05 11:39:43 1.20
@@ -55,6 +55,9 @@
ULTRAPOSSUM_INIT_LDIF_IN=`ultrapossum_getconf ULTRAPOSSUM_INIT_LDIF_IN $TEMPLATEDIR/init.ldif.in`
INITLDIF=`ultrapossum_getconf INITLDIF $CONFDIR/init.ldif`
+ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR=`ultrapossum_getconf ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR $TEMPLATEDIR/init.ldif.d`
+INITLDIFDIR=`ultrapossum_getconf INITLDIFDIR $CONFDIR/init.ldif.d`
+
# Default Configuration
ROOTRDN=`ultrapossum_getconf ROOTRDN cn=admin`
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/server/Makefile.am 2004/04/02 02:34:09 1.4
+++ ultrapossum/module/server/Makefile.am 2004/04/05 11:39:43 1.5
@@ -21,6 +21,7 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/
$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/
+ $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/init.ldif.d/
$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/lib/$(PACKAGE)/conf.d
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/apps.d
$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/backups/$(PACKAGE)
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/module/server/createdb.sh 2004/04/02 07:14:05 1.10
+++ ultrapossum/module/server/createdb.sh 2004/04/05 11:39:43 1.11
@@ -81,6 +81,7 @@
if test -f "$INITLDIF" && egrep "^dn: " "$INITLDIF" > /dev/null; then
extraldifs="$extraldifs $INITLDIF"
fi
+ extraldifs="$extraldifs `find $INITLDIFDIR -type f | tr '\n' ' '`"
else
ldiffile=$DIRECTORY/$HOST.ldif
if ! test -s $ldiffile; then
@@ -106,7 +107,7 @@
echo "failed" 1>&2
exit 1
fi
-
+echo $extraldifs
for l in $extraldifs
do
echo -n "Setting up `basename $l .ldif` entries... " 1>&2
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ultrapossum/module/server/update-server 2004/04/05 11:15:05 1.28
+++ ultrapossum/module/server/update-server 2004/04/05 11:39:43 1.29
@@ -102,6 +102,14 @@
/bin/rm -f $INITLDIF
fi
+ /bin/rm -rf "$INITLDIFDIR"
+ install -d "$INITLDIFDIR"
+ find $ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR -type f | while read f; do
+ echo -n "Configuring `basename $f` LDIF... " 1>&2
+ sed -e "s/#SUFFIX#/$SUFFIX/" < $f > $INITLDIFDIR/`basename $f`
+ echo "done" 1>&2
+ done
+
index_new=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF || true`
if test "x$update" != "x" && test -d $DIRECTORY && test "x$index" != "x$index_new"; then
if test "`$MODULEDIR/server/startup status`" = "running"; then
@@ -241,6 +249,7 @@
remove() {
/bin/rm -f $ULTRAPOSSUMLDIF $ULTRAPOSSUM_SLAPD_CONF
/bin/rm -f $APPSLDIF $SLAPDMASTERCONF $INITLDIF
+ /bin/rm -rf $INITLDIFDIR
/bin/rm -f $ULTRAPOSSUM_MASTER_SLAPD_CONF
if test -f "$SLAPDCONF"; then
strip_vaconf $SLAPDCONF "SCHEMA"