Masato Taruishi
taru****@users*****
2004年 4月 6日 (火) 12:09:22 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ultrapossum/module/server/00server 2004/04/05 16:23:37 1.21
+++ ultrapossum/module/server/00server 2004/04/06 03:09:22 1.22
@@ -55,8 +55,7 @@
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`
+INITLDIFDIR=`ultrapossum_getconf INITLDIFDIR $SYSCONFDIR/init.ldif.d`
# Default Configuration
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/Makefile.am 2004/04/05 18:07:13 1.6
+++ ultrapossum/module/server/Makefile.am 2004/04/06 03:09:22 1.7
@@ -22,7 +22,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)/$(sysconfdir)/$(PACKAGE)/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/update-server,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ultrapossum/module/server/update-server 2004/04/05 11:51:17 1.30
+++ ultrapossum/module/server/update-server 2004/04/06 03:09:22 1.31
@@ -102,14 +102,6 @@
/bin/rm -f $INITLDIF
fi
- /bin/rm -rf "$INITLDIFDIR"
- install -d "$INITLDIFDIR"
- find $ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR -type f | sort | 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
@@ -249,7 +241,6 @@
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"