Masato Taruishi
taru****@sourc*****
2004年 6月 15日 (火) 13:42:53 JST
===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/module/failover/update-failover 2004/04/02 18:30:54 1.7
+++ ultrapossum/module/failover/update-failover 2004/06/15 04:42:53 1.8
@@ -32,7 +32,7 @@
configure_mon() {
monid="MON"
if test "x$TYPE" = "xmaster" && test "x$BACKUP" != "x"; then
- echo -n "Configuring mon... " 1>&2
+ progress "Configuring mon... "
add_startmark "##" $monid > $ULTRAPOSSUM_MON_CF
sed -e "s/#ROOTDN#/$ROOTDN/" -e "s/#LOADBALANCER#/$LOADBALANCER/" \
-e "s/#HOST#/$HOST/" \
@@ -42,16 +42,16 @@
< $ULTRAPOSSUM_MON_CFIN >> $ULTRAPOSSUM_MON_CF
add_endmark "##" $monid >> $ULTRAPOSSUM_MON_CF
add_end_vaconf $MONCF $ULTRAPOSSUM_MON_CF $monid
- echo "done" 1>&2
+ progress "Configuring mon... done"
if test "x$MONUSER" != "xroot"; then
- echo -n "Registering $MONUSER as sudoers... " 1>&2
+ progress "Registering $MONUSER as sudoers... "
add_startmark "##" $monid > $tmp
echo "$MONUSER ALL = (ALL) NOPASSWD: $MODULEDIR/server/startup" >> $tmp
add_endmark "##" $monid >> $tmp
add_end_vaconf $SUDOERS $tmp $monid
chmod 440 $SUDOERS
- echo "done" 1>&2
+ progress "Registering $MONUSER as sudoers... done"
else
remove_mon_sudoers
fi
@@ -78,7 +78,7 @@
configure_heartbeat() {
if test "x$TYPE" = "xmaster" && test "x$BACKUP" != "x"; then
- echo -n "Configuring heartbeat... " 1>&2
+ progress "Configuring heartbeat... "
strip_vaconf $HACF "HACF"
# ha.cf configuration
@@ -105,7 +105,7 @@
add_endmark "##" "HARESOURCES" >> $tmp
add_end_vaconf $HARESOURCES $tmp "HARESOURCES"
fi
- echo "done" 1>&2
+ progress "Configuring heartbeat... done"
else
if test -f $HACF; then strip_vaconf $HACF "HACF"; fi
if test -f $HARESOURCES; then strip_vaconf $HARESOURCES "HARESOURCES"; fi
@@ -131,25 +131,25 @@
if test -f $HACF; then
:
else
- echo -n "Installing New version of ha.cf... "
- $MODULEDIR/failover/ha.cf.sh > $HACF
- echo "done"
+ progress "Installing New version of ha.cf... "
+ $MODULEDIR/failover/ha.cf.sh > $HACF
+ progress "Installing New version of ha.cf... done"
fi
if test -f $HARESOURCES; then
:
else
- echo -n "Installing New Version of haresources... "
+ progress "Installing New Version of haresources... "
cat $TEMPLATEDIR/haresources.in > $HARESOURCES
- echo "done"
+ progress "Installing New Version of haresources... done"
fi
if test -f $AUTHKEYS; then
:
else
- echo -n "Installing New version of authkeys... "
+ progress "Installing New version of authkeys... "
cp /dev/null $AUTHKEYS
chmod 600 $AUTHKEYS
$MODULEDIR/failover/authkeys.sh > $AUTHKEYS
- echo "done"
+ progress "Installing New version of authkeys... done"
fi
fi
if test "x$BACKUP" != "x" && ! include "$BACKUP" "$SYNCBACKUPS"; then