Masato Taruishi
taru****@users*****
2004年 10月 7日 (木) 18:58:24 JST
===================================================================
RCS file: plugin/ultramonkey/10ultramonkey,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/ultramonkey/10ultramonkey 2004/07/22 05:02:10 1.2
+++ plugin/ultramonkey/10ultramonkey 2004/10/07 09:58:24 1.3
@@ -24,19 +24,22 @@
if test "x$cache" = "x"; then
# ldirectord definition
-LDIRECTORDCF=${LDIRECTORDCF:-$hasysconfdir/ldirectord.cf}
-LDIRECTORDCFIN=${LDIRECTORDCFIN:-$TEMPLATEDIR/ldirectord.cf.in}
+LDIRECTORDCF=$(ultrapossum_getconf LDIRECTORDCF "$hasysconfdir/ldirectord.cf")
+LDIRECTORDCFIN=$(ultrapossum_getconf LDIRECTORDCFIN "$TEMPLATEDIR/ldirectord.cf.in")
# Streamline definition
-ULTRAMONKEYDEVICE=${ULTRAMONKEYDEVICE:-eth0:0}
+ULTRAMONKEYDEVICE=$(ultrapossum_getconf ULTRAMONKEYDEVICE "eth0:0")
# Ultramonkey Failover definition
-ULTRAMONKEYNODES=${ULTRAMONKEYNODES:-$HOST}
+ULTRAMONKEYNODES=$(ultrapossum_getconf ULTRAMONKEYNODES "$HOST")
# Ultramonkey Heartbeat definition
-HA_DIR=${HA_DIR:-$hasysconfdir}
-HACF=${HACF:-$HA_DIR/ha.cf}
-HARESOURCES=${HARESOURCES:-$HA_DIR/haresources}
+HA_DIR=$(ultrapossum_getconf HA_DIR "$hasysconfdir")
+HACF=$(ultrapossum_getconf HACF "$HA_DIR/ha.cf")
+HARESOURCES=$(ultrapossum_getconf HARESOURCES "$HA_DIR/haresources")
+
+# Slave IP
+VIRTUALSLAVE=$(ultrapossum_getconf VIRTUALSLAVE `getent hosts $LDAPSLAVE | cut -d' ' -f1 | head -1`)
fi
===================================================================
RCS file: plugin/ultramonkey/update-ultramonkey,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/ultramonkey/update-ultramonkey 2004/09/27 09:09:51 1.4
+++ plugin/ultramonkey/update-ultramonkey 2004/10/07 09:58:24 1.5
@@ -132,7 +132,7 @@
progress "Creating Initial ldirectord.cf... done"
fi
if test "x$VIRTUALSLAVE" = "x"; then
- echo "You have to set VIRTUALSLAVE directive to configure UltraMonkey" 1>&2
+ echo "Can't resolve IP address of $LDAPSLAVE" 1>&2
exit 1
fi
}