Masato Taruishi
taru****@sourc*****
2004年 4月 20日 (火) 17:25:13 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ultrapossum/module/server/00server 2004/04/20 07:50:06 1.24
+++ ultrapossum/module/server/00server 2004/04/20 08:25:13 1.25
@@ -168,6 +168,7 @@
fi
ULTRAPOSSUM_APPS=`find /usr/share/ultrapossum/apps.d/ -type f | xargs -n1 basename | tr '\n' ' '`
+ULTRAPOSSUM_INDEX=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF 2> /dev/null || true`
ULTRAPOSSUM_SLAPD_CONFIN=`ultrapossum_getconf ULTRAPOSSUM_SLAPD_CONFIN $TEMPLATEDIR/slapd-$SLAPD_BACKEND_DB_TYPE.conf.in`
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ultrapossum/module/server/update-server 2004/04/06 03:09:22 1.31
+++ ultrapossum/module/server/update-server 2004/04/20 08:25:13 1.32
@@ -39,11 +39,6 @@
add_end_vaconf $SLAPDCONF $tmp "SCHEMA"
- if test -f "$ULTRAPOSSUM_MASTER_SLAPD_CONF"; then
- index=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF 2> /dev/null || true`
- update=1
- fi
-
cp /dev/null $ULTRAPOSSUM_SLAPD_CONF
cp /dev/null $ULTRAPOSSUM_MASTER_SLAPD_CONF
chmod 600 $ULTRAPOSSUM_SLAPD_CONF $ULTRAPOSSUM_MASTER_SLAPD_CONF
@@ -103,7 +98,7 @@
fi
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 "x$ULTRAPOSSUM_INDEX" != "x$index_new"; then
if test "`$MODULEDIR/server/startup status`" = "running"; then
echo "W: index configuration is changed while server is running" 1>&2
else