Masato Taruishi
taru****@sourc*****
2004年 6月 15日 (火) 13:39:48 JST
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ultrapossum/module/server/update-server 2004/06/15 04:36:55 1.37
+++ ultrapossum/module/server/update-server 2004/06/15 04:39:48 1.38
@@ -90,17 +90,17 @@
progress "Configuring OpenLDAP for $TYPE... done"
if test -f "$ULTRAPOSSUM_INIT_LDIF_IN"; then
- echo -n "Configuring initial LDIF... " 1>&2
+ progress "Configuring initial LDIF... "
sed -e "s/#SUFFIX#/$SUFFIX/" < $ULTRAPOSSUM_INIT_LDIF_IN > $INITLDIF
- echo "done" 1>&2
+ progress "Configuring initial LDIF... done"
else
/bin/rm -f $INITLDIF
fi
if ! test -d "`dirname $SLAPD_PIDFILE`"; then
- echo -n "Creating `dirname $SLAPD_PIDFILE` for pidfile... " 1>&2
+ progress "Creating `dirname $SLAPD_PIDFILE` for pidfile... "
install -d `dirname $SLAPD_PIDFILE`
- echo "done" 1>&2
+ progress "Creating `dirname $SLAPD_PIDFILE` for pidfile... done"
fi
if ! test -d "$DIRECTORY"; then
@@ -108,7 +108,6 @@
else
index_old=`getvalue $DIRECTORY/ultrapossum-environ ULTRAPOSSUM_INDEX`
if test "x$ULTRAPOSSUM_INDEX" != "x$index_old"; then
- echo "index; $ULTRAPOSSUM_INDEX, old: $index_old" 1>&2
if test "`$MODULEDIR/server/startup status`" = "running"; then
echo "W: index configuration is changed while server is running" 1>&2
else
@@ -135,10 +134,10 @@
if test -f "$RPLDIR/$HOST/replica/slurpd.replog" ||
test -f "$REPLOGFILE"
then
- echo -n "Removing replog... " 1>&2
+ progress "Removing replog... "
/bin/rm -f $RPLDIR/$HOST/replica/slurpd.replog 2> /dev/null
/bin/rm -f $REPLOGFILE 2> /dev/null
- echo "done" 1>&2
+ progress "Removing replog... done"
fi
/bin/rm -f $DIRECTORY/*.ldif 2> /dev/null
else
@@ -150,9 +149,9 @@
egrep -v "^replica: $b" $RPLDIR/$HOST/replica/slurpd.replog > $RPLDIR/$HOST/replica/slurpd.replog.tmp
mv $RPLDIR/$HOST/replica/slurpd.replog.tmp $RPLDIR/$HOST/replica/slurpd.replog
fi
- echo -n "Removing obsolete LDIF for $b... " 1>&2
- /bin/rm -f $f
- echo "done" 1>&2
+ progress "Removing obsolete LDIF for $b... "
+ /bin/rm -f $f
+ progress "Removing obsolete LDIF for $b... done"
fi
done
fi
@@ -160,12 +159,12 @@
for host in $SLURPDSLAVES
do
if ! test -f "$DIRECTORY/$host.ldif"; then
- echo -n "Creating $host LDIF... " 1>&2
+ progress "Creating $host LDIF... "
touch $DIRECTORY/$host.ldifT
chmod 600 $DIRECTORY/$host.ldifT
slapcat -b $SUFFIX -f $SLAPDMASTERCONF > $DIRECTORY/$host.ldifT
mv $DIRECTORY/$host.ldifT $DIRECTORY/$host.ldif
- echo "done" 1>&2
+ progress "Creating $host LDIF... done"
fi
done
fi